X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fmodules.c;h=999c1e455b5cb0efa84c0b4e108977ff90cc7275;hb=de8a9544f9caf441808a9433077c3ae00e55b1da;hp=2892b2cbf5de1f895d37d0d1d092e976710f7390;hpb=4772289dac12cfddca874a9aa2ab333f4a48a146;p=vlc diff --git a/src/modules/modules.c b/src/modules/modules.c index 2892b2cbf5..999c1e455b 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -28,7 +28,8 @@ # include "config.h" #endif -#include +#include +#include #include "libvlc.h" /* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS @@ -84,10 +85,13 @@ #include "config/configuration.h" #include "vlc_charset.h" +#include "vlc_arrays.h" #include "modules/modules.h" #include "modules/builtin.h" +module_bank_t *p_module_bank; + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -98,14 +102,12 @@ static int AllocatePluginFile ( vlc_object_t *, char *, int64_t, int64_t ); static module_t * AllocatePlugin( vlc_object_t *, char * ); #endif static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) ); -static int DeleteModule ( module_t *, vlc_bool_t ); +static void DeleteModule ( module_t *, bool ); #ifdef HAVE_DYNAMIC_PLUGINS static void DupModule ( module_t * ); static void UndupModule ( module_t * ); #endif -static void module_LoadMain( vlc_object_t *p_this ); - /** * Init bank * @@ -117,37 +119,33 @@ static void module_LoadMain( vlc_object_t *p_this ); void __module_InitBank( vlc_object_t *p_this ) { module_bank_t *p_bank = NULL; - vlc_value_t lockval; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( p_libvlc_global->p_module_bank ) + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + + if( p_module_bank == NULL ) { - p_libvlc_global->p_module_bank->i_usage++; - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); - return; + p_bank = vlc_custom_create( p_this, sizeof(module_bank_t), + VLC_OBJECT_GENERIC, "module bank"); + p_bank->i_usage = 1; + p_bank->i_cache = p_bank->i_loaded_cache = 0; + p_bank->pp_cache = p_bank->pp_loaded_cache = NULL; + p_bank->b_cache = p_bank->b_cache_dirty = + p_bank->b_cache_delete = false; + + /* Everything worked, attach the object */ + p_module_bank = p_bank; + + /* Fills the module bank structure with the main module infos. + * This is very useful as it will allow us to consider the main + * library just as another module, and for instance the configuration + * options of main will be available in the module bank structure just + * as for every other module. */ + AllocateBuiltinModule( p_this, vlc_entry__main ); } - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + else + p_module_bank->i_usage++; - p_bank = vlc_object_create( p_this, sizeof(module_bank_t) ); - if( !p_bank ) - return; - p_bank->psz_object_name = "module bank"; - p_bank->i_usage = 1; - p_bank->i_cache = p_bank->i_loaded_cache = 0; - p_bank->pp_cache = p_bank->pp_loaded_cache = NULL; - p_bank->b_cache = p_bank->b_cache_dirty = - p_bank->b_cache_delete = VLC_FALSE; - - /* Everything worked, attach the object */ - p_libvlc_global->p_module_bank = p_bank; - vlc_object_attach( p_bank, p_libvlc_global ); - - module_LoadMain( p_this ); + vlc_mutex_unlock( lock ); } @@ -162,32 +160,25 @@ void __module_InitBank( vlc_object_t *p_this ) void __module_EndBank( vlc_object_t *p_this ) { module_t * p_next = NULL; - vlc_value_t lockval; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( !p_libvlc_global->p_module_bank ) + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + if( !p_module_bank ) { - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); return; } - if( --p_libvlc_global->p_module_bank->i_usage ) + if( --p_module_bank->i_usage ) { - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); return; } - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); /* Save the configuration */ config_AutoSaveConfigFile( p_this ); #ifdef HAVE_DYNAMIC_PLUGINS -# define p_bank p_libvlc_global->p_module_bank +# define p_bank p_module_bank if( p_bank->b_cache ) CacheSave( p_this ); while( p_bank->i_loaded_cache-- ) { @@ -220,57 +211,14 @@ void __module_EndBank( vlc_object_t *p_this ) # undef p_bank #endif - vlc_object_detach( p_libvlc_global->p_module_bank ); - - while( p_libvlc_global->p_module_bank->i_children ) - { - p_next = (module_t *)p_libvlc_global->p_module_bank->pp_children[0]; - - if( DeleteModule( p_next, VLC_TRUE ) ) - { - /* Module deletion failed */ - msg_Err( p_this, "module \"%s\" can't be removed, trying harder", - p_next->psz_object_name ); - - /* We just free the module by hand. Niahahahahaha. */ - vlc_object_detach( p_next ); - vlc_object_release( p_next ); - } - } - - vlc_object_release( p_libvlc_global->p_module_bank ); - p_libvlc_global->p_module_bank = NULL; -} - -/** - * Load the main program info into the module bank. - * - * Fills the module bank structure with the main module infos. - * This is very useful as it will allow us to consider the main program just - * as another module, and for instance the configuration options of main will - * be available in the module bank structure just as for every other module. - * \param p_this vlc object structure - * \return nothing - */ -static void module_LoadMain( vlc_object_t *p_this ) -{ - vlc_value_t lockval; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( p_libvlc_global->p_module_bank->b_main ) + while( vlc_internals( p_module_bank )->i_children ) { - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); - return; + p_next = (module_t *)vlc_internals( p_module_bank )->pp_children[0]; + DeleteModule( p_next, true ); } - p_libvlc_global->p_module_bank->b_main = VLC_TRUE; - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); - AllocateBuiltinModule( p_this, vlc_entry__main ); + vlc_object_release( p_module_bank ); + p_module_bank = NULL; } /** @@ -282,21 +230,14 @@ static void module_LoadMain( vlc_object_t *p_this ) */ void __module_LoadBuiltins( vlc_object_t * p_this ) { - vlc_value_t lockval; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( p_libvlc_global->p_module_bank->b_builtins ) + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + if( p_module_bank->b_builtins ) { - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); return; } - p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE; - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + p_module_bank->b_builtins = true; + vlc_mutex_unlock( lock ); msg_Dbg( p_this, "checking builtin modules" ); ALLOCATE_ALL_BUILTINS(); @@ -313,29 +254,22 @@ void __module_LoadBuiltins( vlc_object_t * p_this ) void __module_LoadPlugins( vlc_object_t * p_this ) { #ifdef HAVE_DYNAMIC_PLUGINS - vlc_value_t lockval; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - - var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); - var_Get( p_libvlc_global, "libvlc", &lockval ); - vlc_mutex_lock( lockval.p_address ); - if( p_libvlc_global->p_module_bank->b_plugins ) + vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + if( p_module_bank->b_plugins ) { - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + vlc_mutex_unlock( lock ); return; } - p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE; - vlc_mutex_unlock( lockval.p_address ); - var_Destroy( p_libvlc_global, "libvlc" ); + p_module_bank->b_plugins = true; + vlc_mutex_unlock( lock ); msg_Dbg( p_this, "checking plugin modules" ); if( config_GetInt( p_this, "plugins-cache" ) ) - p_libvlc_global->p_module_bank->b_cache = VLC_TRUE; + p_module_bank->b_cache = true; - if( p_libvlc_global->p_module_bank->b_cache || - p_libvlc_global->p_module_bank->b_cache_delete ) CacheLoad( p_this ); + if( p_module_bank->b_cache || + p_module_bank->b_cache_delete ) CacheLoad( p_this ); AllocateAllPlugins( p_this ); #endif @@ -348,7 +282,7 @@ void __module_LoadPlugins( vlc_object_t * p_this ) * \param cap the capability to check * \return TRUE if the module have the capability */ -vlc_bool_t module_IsCapable( const module_t *m, const char *cap ) +bool module_IsCapable( const module_t *m, const char *cap ) { return !strcmp( m->psz_capability, cap ); } @@ -371,7 +305,7 @@ const char *module_GetObjName( const module_t *m ) * \param long_name TRUE to have the long name of the module * \return the short or long name of the module */ -const char *module_GetName( const module_t *m, vlc_bool_t long_name ) +const char *module_GetName( const module_t *m, bool long_name ) { if( long_name && ( m->psz_longname != NULL) ) return m->psz_longname; @@ -394,6 +328,12 @@ const char *module_GetHelp( const module_t *m ) * module Need * * Return the best module function, given a capability list. + * + * If the p_this object doesn't have it's psz_object_name set, then + * psz_object_name will be set to the module's name, unless the user + * provided an alias using the "module name@alias" syntax in which case + * psz_object_name will be set to the alias. + * * \param p_this the vlc object * \param psz_capability list of capabilities needed * \param psz_name name of the module asked @@ -401,15 +341,17 @@ const char *module_GetHelp( const module_t *m ) * \return the module or NULL in case of a failure */ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, - const char *psz_name, vlc_bool_t b_strict ) + const char *psz_name, bool b_strict ) { typedef struct module_list_t module_list_t; + stats_TimerStart( p_this, "module_Need()", STATS_TIMER_MODULE_NEED ); + struct module_list_t { module_t *p_module; int i_score; - vlc_bool_t b_force; + bool b_force; module_list_t *p_next; }; @@ -422,17 +364,13 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, int i_shortcuts = 0; char *psz_shortcuts = NULL, *psz_var = NULL, *psz_alias = NULL; - vlc_bool_t b_force_backup = p_this->b_force; + bool b_force_backup = p_this->b_force; /* Deal with variables */ if( psz_name && psz_name[0] == '$' ) { - vlc_value_t val; - var_Create( p_this, psz_name + 1, VLC_VAR_MODULE | VLC_VAR_DOINHERIT ); - var_Get( p_this, psz_name + 1, &val ); - psz_var = val.psz_string; - psz_name = psz_var; + psz_name = psz_var = var_CreateGetString( p_this, psz_name + 1 ); } /* Count how many different shortcuts were asked for */ @@ -444,6 +382,9 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, if( !strcmp( psz_name, "none" ) ) { free( psz_var ); + stats_TimerStop( p_this, STATS_TIMER_MODULE_NEED ); + stats_TimerDump( p_this, STATS_TIMER_MODULE_NEED ); + stats_TimerClean( p_this, STATS_TIMER_MODULE_NEED ); return NULL; } @@ -465,12 +406,12 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { if( !strcmp(psz_last_shortcut, "none") ) { - b_strict = VLC_TRUE; + b_strict = true; i_shortcuts--; } else if( !strcmp(psz_last_shortcut, "any") ) { - b_strict = VLC_FALSE; + b_strict = false; i_shortcuts--; } } @@ -506,7 +447,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, /* If we required a shortcut, check this plugin provides it. */ if( i_shortcuts > 0 ) { - vlc_bool_t b_trash; + bool b_trash; const char *psz_name = psz_shortcuts; /* Let's drop modules with a <= 0 score (unless they are @@ -620,7 +561,7 @@ found_shortcut: { CacheMerge( p_this, p_module, p_new_module ); vlc_object_attach( p_new_module, p_module ); - DeleteModule( p_new_module, VLC_TRUE ); + DeleteModule( p_new_module, true ); } } #endif @@ -691,12 +632,19 @@ found_shortcut: /* This assumes that p_this is the object which will be using the * module. That's not always the case ... but it is in most cases. */ - p_this->psz_object_name = p_module->psz_object_name; + if( psz_alias ) + p_this->psz_object_name = strdup( psz_alias ); + else + p_this->psz_object_name = strdup( p_module->psz_object_name ); } free( psz_shortcuts ); free( psz_var ); + stats_TimerStop( p_this, STATS_TIMER_MODULE_NEED ); + stats_TimerDump( p_this, STATS_TIMER_MODULE_NEED ); + stats_TimerClean( p_this, STATS_TIMER_MODULE_NEED ); + /* Don't forget that the module is still locked */ return p_module; } @@ -721,8 +669,6 @@ void __module_Unneed( vlc_object_t * p_this, module_t * p_module ) msg_Dbg( p_this, "removing module \"%s\"", p_module->psz_object_name ); vlc_object_release( p_module ); - - return; } /** @@ -773,17 +719,17 @@ void module_Put( module_t *module ) * \param psz_name th name of the module * \return TRUE if the module exists */ -vlc_bool_t __module_Exists( vlc_object_t *p_this, const char * psz_name ) +bool __module_Exists( vlc_object_t *p_this, const char * psz_name ) { module_t *p_module = __module_Find( p_this, psz_name ); if( p_module ) { module_Put( p_module ); - return VLC_TRUE; + return true; } else { - return VLC_FALSE; + return false; } } @@ -845,7 +791,7 @@ char ** __module_GetModulesNamesForCapability( vlc_object_t *p_this, psz_ret[j] = strdup( k>=0?p_module->pp_shortcuts[k] :p_module->psz_object_name ); if( pppsz_longname ) - (*pppsz_longname)[j] = strdup( module_GetName( p_module, VLC_TRUE ) ); + (*pppsz_longname)[j] = strdup( module_GetName( p_module, true ) ); j++; } } @@ -913,7 +859,7 @@ void module_PutConfig( module_config_t *config ) static char * copy_next_paths_token( char * paths, char ** remaining_paths ) { char * path; - int i; + int i, done; bool escaped = false; assert( paths ); @@ -923,20 +869,27 @@ static char * copy_next_paths_token( char * paths, char ** remaining_paths ) if( !path ) return NULL; /* Look for PATH_SEP_CHAR (a ':' or a ';') */ - for( i = 0; paths[i]; i++ ) { + for( i = 0, done = 0 ; paths[i]; i++ ) + { /* Take care of \\ and \: or \; escapement */ - if( escaped ) { + if( escaped ) + { escaped = false; - path[i] = paths[i]; + path[done++] = paths[i]; } +#ifdef WIN32 + else if( paths[i] == '/' ) + escaped = true; +#else else if( paths[i] == '\\' ) escaped = true; +#endif else if( paths[i] == PATH_SEP_CHAR ) break; else - path[i] = paths[i]; + path[done++] = paths[i]; } - path[i] = 0; + path[done++] = 0; /* Return the remaining paths */ if( remaining_paths ) { @@ -952,60 +905,39 @@ static char * copy_next_paths_token( char * paths, char ** remaining_paths ) #ifdef HAVE_DYNAMIC_PLUGINS static void AllocateAllPlugins( vlc_object_t *p_this ) { - char *paths, *path, *paths_iter; - char * extra_path; + const char *vlcpath = vlc_global()->psz_vlcpath; + int count,i; + char * path; + vlc_array_t *arraypaths = vlc_array_new(); /* Contruct the special search path for system that have a relocatable * executable. Set it to /modules and /plugins. */ -#if defined( WIN32 ) || defined( UNDER_CE ) || defined( __APPLE__ ) || defined( SYS_BEOS ) - if( asprintf( &extra_path, - "%s" DIR_SEP "modules" PATH_SEP - "%s" DIR_SEP "plugins" - "%s", - vlc_global()->psz_vlcpath, - vlc_global()->psz_vlcpath, -# if defined( WIN32 ) || defined( UNDER_CE ) - "" ) < 0 ) -# else - PATH_SEP PLUGIN_PATH ) < 0 ) -# endif - { - msg_Err( p_this, "Not enough memory" ); - return; - } -#else - extra_path = strdup( PLUGIN_PATH ); + if( vlcpath && asprintf( &path, "%s" DIR_SEP "modules", vlcpath ) != -1 ) + vlc_array_append( arraypaths, path ); + if( vlcpath && asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 ) + vlc_array_append( arraypaths, path ); +#ifndef WIN32 + vlc_array_append( arraypaths, strdup( PLUGIN_PATH ) ); #endif /* If the user provided a plugin path, we add it to the list */ - char * userpaths = config_GetPsz( p_this, "plugin-path" ); + char *userpaths = config_GetPsz( p_this, "plugin-path" ); + char *paths_iter; - if( asprintf( &paths, "modules" PATH_SEP "%s" PATH_SEP "plugins%s%s", - extra_path, - userpaths ? PATH_SEP : "", - userpaths ? userpaths : "" ) < 0 ) + for( paths_iter = userpaths; paths_iter; ) { - msg_Err( p_this, "Not enough memory" ); - free( userpaths ); - free( extra_path ); - return; + path = copy_next_paths_token( paths_iter, &paths_iter ); + if( path ) + vlc_array_append( arraypaths, path ); } - /* Free plugin-path and extra path */ - free( userpaths ); - free( extra_path ); - - msg_Dbg( p_this, "We will be looking for modules in `%s'", paths ); - - for( paths_iter = paths; paths_iter; ) + count = vlc_array_count( arraypaths ); + for( i = 0 ; i < count ; i++ ) { - path = copy_next_paths_token( paths_iter, &paths_iter ); + path = vlc_array_item_at_index( arraypaths, i ); if( !path ) - { - msg_Err( p_this, "Not enough memory" ); - return; - } + continue; msg_Dbg( p_this, "recursively browsing `%s'", path ); @@ -1015,7 +947,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) free( path ); } - free( paths ); + vlc_array_destroy( arraypaths ); + free( userpaths ); } /***************************************************************************** @@ -1233,7 +1166,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, module_config_t *p_item = NULL, *p_end = NULL; p_module = p_cache_entry->p_module; - p_module->b_loaded = VLC_FALSE; + p_module->b_loaded = false; /* For now we force loading if the module's config contains * callbacks or actions. @@ -1248,27 +1181,25 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, } } if( p_module == p_cache_entry->p_module ) - p_cache_entry->b_used = VLC_TRUE; + p_cache_entry->b_used = true; } } if( p_module ) { - libvlc_global_data_t *p_libvlc_global = vlc_global(); - /* Everything worked fine ! * The module is ready to be added to the list. */ - p_module->b_builtin = VLC_FALSE; + p_module->b_builtin = false; /* msg_Dbg( p_this, "plugin \"%s\", %s", p_module->psz_object_name, p_module->psz_longname ); */ - vlc_object_attach( p_module, p_libvlc_global->p_module_bank ); + vlc_object_attach( p_module, p_module_bank ); - if( !p_libvlc_global->p_module_bank->b_cache ) + if( !p_module_bank->b_cache ) return 0; -#define p_bank p_libvlc_global->p_module_bank +#define p_bank p_module_bank /* Add entry to cache */ p_bank->pp_cache = realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); @@ -1279,9 +1210,10 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, p_bank->pp_cache[p_bank->i_cache]->i_time = i_file_time; p_bank->pp_cache[p_bank->i_cache]->i_size = i_file_size; p_bank->pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1; - p_bank->pp_cache[p_bank->i_cache]->b_used = VLC_TRUE; + p_bank->pp_cache[p_bank->i_cache]->b_used = true; p_bank->pp_cache[p_bank->i_cache]->p_module = p_module; p_bank->i_cache++; +#undef p_bank } return p_module ? 0 : -1; @@ -1307,7 +1239,6 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) p_module = vlc_module_create( p_this ); if( p_module == NULL ) { - msg_Err( p_this, "out of memory" ); module_Unload( handle ); return NULL; } @@ -1315,10 +1246,10 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) /* We need to fill these since they may be needed by module_Call() */ p_module->psz_filename = psz_file; p_module->handle = handle; - p_module->b_loaded = VLC_TRUE; + p_module->b_loaded = true; /* Initialize the module: fill p_module, default config */ - if( module_Call( p_module ) != 0 ) + if( module_Call( VLC_OBJECT(p_module), p_module ) != 0 ) { /* We couldn't call module_init() */ vlc_object_release( p_module ); @@ -1330,7 +1261,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) p_module->psz_filename = strdup( p_module->psz_filename ); /* Everything worked fine ! The module is ready to be added to the list. */ - p_module->b_builtin = VLC_FALSE; + p_module->b_builtin = false; return p_module; } @@ -1343,7 +1274,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) *****************************************************************************/ static void DupModule( module_t *p_module ) { - const char **pp_shortcut; + char **pp_shortcut; int i_submodule; for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ ) @@ -1353,7 +1284,6 @@ static void DupModule( module_t *p_module ) /* We strdup() these entries so that they are still valid when the * module is unloaded. */ - p_module->psz_object_name = strdup( p_module->psz_object_name ); p_module->psz_capability = strdup( p_module->psz_capability ); p_module->psz_shortname = p_module->psz_shortname ? strdup( p_module->psz_shortname ) : NULL; @@ -1361,9 +1291,9 @@ static void DupModule( module_t *p_module ) p_module->psz_help = p_module->psz_help ? strdup( p_module->psz_help ) : NULL; - for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) + for( i_submodule = 0; i_submodule < vlc_internals( p_module )->i_children; i_submodule++ ) { - DupModule( (module_t*)p_module->pp_children[ i_submodule ] ); + DupModule( (module_t*)vlc_internals( p_module )->pp_children[ i_submodule ] ); } } @@ -1374,24 +1304,24 @@ static void DupModule( module_t *p_module ) *****************************************************************************/ static void UndupModule( module_t *p_module ) { - const char **pp_shortcut; + char **pp_shortcut; int i_submodule; - for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) + for( i_submodule = 0; i_submodule < vlc_internals( p_module )->i_children; i_submodule++ ) { - UndupModule( (module_t*)p_module->pp_children[ i_submodule ] ); + UndupModule( (module_t*)vlc_internals( p_module )->pp_children[ i_submodule ] ); } for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ ) { - free( (void*)*pp_shortcut ); + free( *pp_shortcut ); } - free( (void*)p_module->psz_object_name ); + FREENULL( p_module->psz_object_name ); free( p_module->psz_capability ); - free( (void*)p_module->psz_shortname ); - free( (void*)p_module->psz_longname ); - free( (void*)p_module->psz_help ); + free( p_module->psz_shortname ); + free( p_module->psz_longname ); + free( p_module->psz_help ); } #endif /* HAVE_DYNAMIC_PLUGINS */ @@ -1412,10 +1342,7 @@ static int AllocateBuiltinModule( vlc_object_t * p_this, * allocate a structure for it */ p_module = vlc_module_create( p_this ); if( p_module == NULL ) - { - msg_Err( p_this, "out of memory" ); return -1; - } /* Initialize the module : fill p_module->psz_object_name, etc. */ if( pf_entry( p_module ) != 0 ) @@ -1428,12 +1355,12 @@ static int AllocateBuiltinModule( vlc_object_t * p_this, } /* Everything worked fine ! The module is ready to be added to the list. */ - p_module->b_builtin = VLC_TRUE; + p_module->b_builtin = true; /* msg_Dbg( p_this, "builtin \"%s\", %s", p_module->psz_object_name, p_module->psz_longname ); */ - vlc_object_attach( p_module, vlc_global()->p_module_bank ); + vlc_object_attach( p_module, p_module_bank ); return 0; } @@ -1443,9 +1370,10 @@ static int AllocateBuiltinModule( vlc_object_t * p_this, ***************************************************************************** * This function can only be called if the module isn't being used. *****************************************************************************/ -static int DeleteModule( module_t * p_module, vlc_bool_t b_detach ) +static void DeleteModule( module_t * p_module, bool b_detach ) { - if( !p_module ) return VLC_EGENERIC; + assert( p_module ); + if( b_detach ) vlc_object_detach( p_module ); @@ -1463,15 +1391,13 @@ static int DeleteModule( module_t * p_module, vlc_bool_t b_detach ) #endif /* Free and detach the object's children */ - while( p_module->i_children ) + while( vlc_internals( p_module )->i_children ) { - vlc_object_t *p_this = p_module->pp_children[0]; + vlc_object_t *p_this = vlc_internals( p_module )->pp_children[0]; vlc_object_detach( p_this ); vlc_object_release( p_this ); } config_Free( p_module ); vlc_object_release( p_module ); - p_module = NULL; - return 0; }