From cc4cca2fd565125ad3260c934df9c88892e375f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 15 Dec 2007 10:51:07 +0000 Subject: [PATCH] - fix symbol list - remove useless IsSubmodule (submodules have NO configuration items anyway, and any sensible UI won't show modules with no configuration) - free checks for NULL anyway --- include/vlc_modules.h | 1 - src/modules/modules.c | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/include/vlc_modules.h b/include/vlc_modules.h index f0c57ea25d..fa8f7ec135 100644 --- a/include/vlc_modules.h +++ b/include/vlc_modules.h @@ -75,7 +75,6 @@ enum vlc_module_properties }; VLC_EXPORT( vlc_bool_t, module_IsCapable, ( const module_t *m, const char *cap ) ); -VLC_EXPORT( vlc_bool_t, module_IsSubModule, ( const module_t *m ) ); VLC_EXPORT( const char *, module_GetObjName, ( const module_t *m ) ); VLC_EXPORT( const char *, module_GetName, ( const module_t *m, vlc_bool_t long_name ) ); #define module_GetLongName( m ) module_GetName( m, VLC_TRUE ) diff --git a/src/modules/modules.c b/src/modules/modules.c index 3eb0eba655..ceefde8a6b 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -331,14 +331,6 @@ vlc_bool_t module_IsCapable( const module_t *m, const char *cap ) return !strcmp( m->psz_capability, cap ); } -/***************************************************************************** - * module_IsSubModule: checks whether a module is a sub-module. - *****************************************************************************/ -vlc_bool_t module_IsSubModule( const module_t *m ) -{ - return m->b_submodule; -} - /***************************************************************************** * module_GetObjName: internal name of a module. *****************************************************************************/ @@ -802,12 +794,11 @@ char ** __module_GetModulesNamesForCapability( vlc_object_t *p_this, module_config_t *module_GetConfig (const module_t *module, unsigned *restrict psize) { unsigned size = module->confsize; - module_config_t *config; assert (psize != NULL); *psize = size; - config = malloc (size * sizeof (*config)); + module_config_t *config = malloc (size * sizeof (*config)); if (config) memcpy (config, module->p_config, size * sizeof (*config)); @@ -816,7 +807,7 @@ module_config_t *module_GetConfig (const module_t *module, unsigned *restrict ps void module_PutConfig (module_config_t *config) { - if(config) free (config); + free (config); } /***************************************************************************** -- 2.39.5