X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fmodules.c;h=8238eb983c57b9ede93cad1f14e6b82c1099da80;hb=a6361e58fd585c7653e3047cece4ca2370c6868b;hp=33b0a8bfafbb2685f7812c9650df8a07931b20ae;hpb=f485214f09dd284cbb85674e937fbbb0a6032a2e;p=vlc diff --git a/src/misc/modules.c b/src/misc/modules.c index 33b0a8bfaf..8238eb983c 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -36,8 +36,6 @@ #include /* sprintf() */ #include /* strdup() */ -#include - #ifdef HAVE_DIRENT_H # include #endif @@ -77,23 +75,21 @@ # endif #endif -#include "vlc_error.h" +#include "misc/configuration.h" #include "vlc_interface.h" -#include "vlc_interaction.h" -#include "intf_eject.h" - #include "vlc_playlist.h" -#include "vlc_video.h" -#include "video_output.h" -#include "vout_synchro.h" -#include "vlc_spu.h" +#include "vlc_stream.h" +#include "vlc_access.h" +#include "vlc_demux.h" + +#include "vlc_vout.h" +#include "vlc_vout_synchro.h" -#include "audio_output.h" -#include "aout_internal.h" +#include "vlc_aout.h" -#include "stream_output.h" +#include "vlc_sout.h" #include "vlc_httpd.h" #include "vlc_acl.h" #include "vlc_tls.h" @@ -102,7 +98,7 @@ #include "vlc_url.h" #include "iso_lang.h" -#include "charset.h" +#include "vlc_charset.h" #include "vlc_block.h" @@ -113,6 +109,9 @@ #include "vlc_update.h" #include "vlc_strings.h" +#include "vlc_streaming.h" + +#include "modules.h" #if defined( _MSC_VER ) && defined( UNDER_CE ) # include "modules_builtin_evc.h" @@ -121,7 +120,7 @@ #else # include "modules_builtin.h" #endif -#include "network.h" +#include "vlc_network.h" #if defined( WIN32 ) || defined( UNDER_CE ) /* Avoid name collisions */ @@ -138,7 +137,7 @@ 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 * ); +static int DeleteModule ( module_t *, vlc_bool_t ); #ifdef HAVE_DYNAMIC_PLUGINS static void DupModule ( module_t * ); static void UndupModule ( module_t * ); @@ -159,6 +158,8 @@ static char * GetWindowsError ( void ); #endif #endif +static void module_LoadMain( vlc_object_t *p_this ); + /* Sub-version number * (only used to avoid breakage in dev version when cache structure changes) */ @@ -172,7 +173,7 @@ static char * GetWindowsError ( void ); *****************************************************************************/ void __module_InitBank( vlc_object_t *p_this ) { - module_bank_t *p_bank; + module_bank_t *p_bank = NULL; vlc_value_t lockval; var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); @@ -189,10 +190,12 @@ void __module_InitBank( vlc_object_t *p_this ) var_Destroy( p_this->p_libvlc_global, "libvlc" ); 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 = 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; @@ -208,8 +211,6 @@ void __module_InitBank( vlc_object_t *p_this ) vlc_object_attach( p_bank, p_this->p_libvlc_global ); module_LoadMain( p_this ); - - return; } /***************************************************************************** @@ -232,7 +233,7 @@ void __module_ResetBank( vlc_object_t *p_this ) *****************************************************************************/ void __module_EndBank( vlc_object_t *p_this ) { - module_t * p_next; + module_t * p_next = NULL; vlc_value_t lockval; var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX ); @@ -260,19 +261,30 @@ void __module_EndBank( vlc_object_t *p_this ) if( p_bank->b_cache ) CacheSave( p_this ); while( p_bank->i_loaded_cache-- ) { - free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file ); - free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ); + if( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ) + { + DeleteModule( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->p_module, p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->b_used ); + free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file ); + free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] ); + p_bank->pp_loaded_cache[p_bank->i_loaded_cache] = NULL; + } } if( p_bank->pp_loaded_cache ) + { free( p_bank->pp_loaded_cache ); - + p_bank->pp_loaded_cache = NULL; + } while( p_bank->i_cache-- ) { free( p_bank->pp_cache[p_bank->i_cache]->psz_file ); free( p_bank->pp_cache[p_bank->i_cache] ); + p_bank->pp_cache[p_bank->i_cache] = NULL; } if( p_bank->pp_cache ) + { free( p_bank->pp_cache ); + p_bank->pp_cache = NULL; + } #undef p_bank #endif @@ -282,7 +294,7 @@ void __module_EndBank( vlc_object_t *p_this ) { p_next = (module_t *)p_this->p_libvlc_global->p_module_bank->pp_children[0]; - if( DeleteModule( p_next ) ) + if( DeleteModule( p_next, VLC_TRUE ) ) { /* Module deletion failed */ msg_Err( p_this, "module \"%s\" can't be removed, trying harder", @@ -308,7 +320,7 @@ void __module_EndBank( vlc_object_t *p_this ) * 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. *****************************************************************************/ -void __module_LoadMain( vlc_object_t *p_this ) +static void module_LoadMain( vlc_object_t *p_this ) { vlc_value_t lockval; @@ -416,7 +428,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, module_t *p_module; int i_shortcuts = 0; - char *psz_shortcuts = NULL, *psz_var = NULL; + char *psz_shortcuts = NULL, *psz_var = NULL, *psz_alias = NULL; vlc_bool_t b_force_backup = p_this->b_force; @@ -501,54 +513,39 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, if( i_shortcuts > 0 ) { vlc_bool_t b_trash; - int i_dummy, i_short = i_shortcuts; - char *psz_name = psz_shortcuts; + const char *psz_name = psz_shortcuts; /* Let's drop modules with a <= 0 score (unless they are * explicitly requested) */ b_trash = p_module->i_score <= 0; - while( i_short > 0 ) + for( unsigned i_short = i_shortcuts; i_short > 0; i_short-- ) { - for( i_dummy = 0; p_module->pp_shortcuts[i_dummy]; i_dummy++ ) + for( unsigned i = 0; p_module->pp_shortcuts[i]; i++ ) { - if( !strcasecmp( psz_name, - p_module->pp_shortcuts[i_dummy] ) ) + char *c; + if( ( c = strchr( psz_name, '@' ) ) + ? !strncasecmp( psz_name, p_module->pp_shortcuts[i], + c-psz_name ) + : !strcasecmp( psz_name, p_module->pp_shortcuts[i] ) ) { /* Found it */ - b_trash = VLC_FALSE; + if( c && c[1] ) + psz_alias = c+1; i_shortcut_bonus = i_short * 10000; - break; + goto found_shortcut; } } - if( i_shortcut_bonus ) - { - /* We found it... remember ? */ - break; - } - /* Go to the next shortcut... This is so lame! */ - while( *psz_name ) - { - psz_name++; - } - psz_name++; - i_short--; + psz_name += strlen( psz_name ) + 1; } /* If we are in "strict" mode and we couldn't * find the module in the list of provided shortcuts, * then kick the bastard out of here!!! */ - if( i_short == 0 && b_strict ) - { - b_trash = VLC_TRUE; - } - - if( b_trash ) - { + if( b_strict ) continue; - } } /* If we didn't require a shortcut, trash <= 0 scored plugins */ else if( p_module->i_score <= 0 ) @@ -556,6 +553,8 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, continue; } +found_shortcut: + /* Special case: test if we requested a particular intf plugin */ if( !i_shortcuts && p_module->psz_program && !strcmp( psz_capability, "interface" ) @@ -578,7 +577,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, /* Store this new module */ p_list[ i_index ].p_module = p_module; p_list[ i_index ].i_score = p_module->i_score + i_shortcut_bonus; - p_list[ i_index ].b_force = !!i_shortcut_bonus; + p_list[ i_index ].b_force = i_shortcut_bonus && b_strict; /* Add it to the modules-to-probe list */ if( i_index == 0 ) @@ -634,8 +633,10 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { #ifdef HAVE_DYNAMIC_PLUGINS /* Make sure the module is loaded in mem */ - module_t *p_module = p_tmp->p_module->b_submodule ? - (module_t *)p_tmp->p_module->p_parent : p_tmp->p_module; + module_t *p_module = p_tmp->p_module; + if( p_module->b_submodule ) + p_module = (module_t *)p_module->p_parent; + if( !p_module->b_builtin && !p_module->b_loaded ) { module_t *p_new_module = @@ -644,7 +645,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { CacheMerge( p_this, p_module, p_new_module ); vlc_object_attach( p_new_module, p_module ); - DeleteModule( p_new_module ); + DeleteModule( p_new_module, VLC_TRUE ); } } #endif @@ -697,6 +698,9 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, { msg_Err( p_this, "no %s module matched \"%s\"", psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); + + msg_StackSet( VLC_EGENERIC, "no %s module matched \"%s\"", + psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); } } else if( psz_name != NULL && *psz_name ) @@ -704,6 +708,19 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability, msg_Warn( p_this, "no %s module matching \"%s\" could be loaded", psz_capability, (psz_name && *psz_name) ? psz_name : "any" ); } + else + msg_StackSet( VLC_EGENERIC, "no suitable %s module", psz_capability ); + + if( p_module && !p_this->psz_object_name ) + { + /* 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. + */ + if( psz_alias ) + p_this->psz_object_name = strdup( psz_alias ); + else + p_this->psz_object_name = strdup( p_module->psz_object_name ); + } if( psz_shortcuts ) { @@ -740,6 +757,31 @@ void __module_Unneed( vlc_object_t * p_this, module_t * p_module ) return; } +/***************************************************************************** + * module_Exists: tell if a module exists. + ***************************************************************************** + * This function is a boolean function that tells if a module exist or not. + *****************************************************************************/ + +vlc_bool_t __module_Exists( vlc_object_t *p_this, const char * psz_name ) +{ + vlc_list_t *p_list; + int i; + p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE ); + for( i = 0 ; i < p_list->i_count; i++) + { + if (!strcmp( + ((module_t *) p_list->p_values[i].p_object)->psz_shortname , + psz_name ) ) + { + /* We can release the list, and return yes */ + vlc_list_release( p_list ); return VLC_TRUE; + } + } + vlc_list_release( p_list ); return VLC_FALSE; +} + + /***************************************************************************** * Following functions are local. *****************************************************************************/ @@ -752,21 +794,22 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) { /* Yes, there are two NULLs because we replace one with "plugin-path". */ #if defined( WIN32 ) || defined( UNDER_CE ) - char *path[] = { "modules", "", "plugins", 0, 0 }; + const char *path[] = { "modules", "", "plugins", NULL, NULL }; #else - char *path[] = { "modules", PLUGIN_PATH, "plugins", 0, 0 }; + const char *path[] = { "modules", PLUGIN_PATH, "plugins", NULL, NULL }; #endif - char **ppsz_path = path; - char *psz_fullpath; + const char *const *ppsz_path; /* If the user provided a plugin path, we add it to the list */ - path[ sizeof(path)/sizeof(char*) - 2 ] = - config_GetPsz( p_this, "plugin-path" ); + char *userpath = config_GetPsz( p_this, "plugin-path" ); + path[sizeof(path)/sizeof(path[0]) - 2] = userpath; - for( ; *ppsz_path != NULL ; ppsz_path++ ) + for (ppsz_path = path; *ppsz_path != NULL; ppsz_path++) { - if( !(*ppsz_path)[0] ) continue; + char *psz_fullpath; + + if (!**ppsz_path) continue; #if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 ) @@ -778,27 +821,16 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) if( (*ppsz_path)[0] != '/' ) #endif { - int i_dirlen = strlen( *ppsz_path ); - i_dirlen += strlen( p_this->p_libvlc_global->psz_vlcpath ) + 2; - - psz_fullpath = malloc( i_dirlen ); - if( psz_fullpath == NULL ) - { - continue; - } -#ifdef WIN32 - sprintf( psz_fullpath, "%s\\%s", - p_this->p_libvlc_global->psz_vlcpath, *ppsz_path ); -#else - sprintf( psz_fullpath, "%s/%s", - p_this->p_libvlc_global->psz_vlcpath, *ppsz_path ); -#endif + if( 0>= asprintf(&psz_fullpath, "%s"DIR_SEP"%s", + p_this->p_libvlc_global->psz_vlcpath, *ppsz_path) ) + psz_fullpath = NULL; } else #endif - { psz_fullpath = strdup( *ppsz_path ); - } + + if( psz_fullpath == NULL ) + continue; msg_Dbg( p_this, "recursively browsing `%s'", psz_fullpath ); @@ -809,9 +841,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) } /* Free plugin-path */ - if( path[ sizeof(path)/sizeof(char*) - 2 ] ) - free( path[ sizeof(path)/sizeof(char*) - 2 ] ); - path[ sizeof(path)/sizeof(char*) - 2 ] = NULL; + if( userpath != NULL ) + free( userpath ); } /***************************************************************************** @@ -820,6 +851,12 @@ static void AllocateAllPlugins( vlc_object_t *p_this ) static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, int i_maxdepth ) { +/* FIXME: Needs to be ported to wide char on ALL Windows builds */ +#ifdef WIN32 +# undef opendir +# undef closedir +# undef readdir +#endif #if defined( UNDER_CE ) || defined( _MSC_VER ) #ifdef UNDER_CE wchar_t psz_wpath[MAX_PATH + 256]; @@ -1002,7 +1039,7 @@ static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir, static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, int64_t i_file_time, int64_t i_file_size ) { - module_t * p_module; + module_t * p_module = NULL; module_cache_t *p_cache_entry = NULL; /* @@ -1024,7 +1061,7 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, } else { - module_config_t *p_item; + module_config_t *p_item = NULL, *p_end = NULL; p_module = p_cache_entry->p_module; p_module->b_loaded = VLC_FALSE; @@ -1032,12 +1069,17 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, /* For now we force loading if the module's config contains * callbacks or actions. * Could be optimized by adding an API call.*/ - for( p_item = p_module->p_config; - p_item->i_type != CONFIG_HINT_END; p_item++ ) + for( p_item = p_module->p_config, p_end = p_item + p_module->confsize; + p_item < p_end; p_item++ ) { if( p_item->pf_callback || p_item->i_action ) + { p_module = AllocatePlugin( p_this, psz_file ); + break; + } } + if( p_module == p_cache_entry->p_module ) + p_cache_entry->b_used = VLC_TRUE; } } @@ -1051,21 +1093,25 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, p_module->psz_object_name, p_module->psz_longname ); */ vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank ); - } - if( !p_this->p_libvlc_global->p_module_bank->b_cache ) return 0; + if( !p_this->p_libvlc_global->p_module_bank->b_cache ) + return 0; - /* Add entry to cache */ + /* Add entry to cache */ #define p_bank p_this->p_libvlc_global->p_module_bank - p_bank->pp_cache = - realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); - p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) ); - p_bank->pp_cache[p_bank->i_cache]->psz_file = strdup( 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]->p_module = p_module; - p_bank->i_cache++; + p_bank->pp_cache = + realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) ); + p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) ); + if( !p_bank->pp_cache[p_bank->i_cache] ) + return -1; + p_bank->pp_cache[p_bank->i_cache]->psz_file = strdup( 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]->p_module = p_module; + p_bank->i_cache++; + } return p_module ? 0 : -1; } @@ -1079,10 +1125,11 @@ static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file, *****************************************************************************/ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) { - module_t * p_module; + module_t * p_module = NULL; module_handle_t handle; - if( LoadModule( p_this, psz_file, &handle ) ) return NULL; + if( LoadModule( p_this, psz_file, &handle ) ) + return NULL; /* Now that we have successfully loaded the module, we can * allocate a structure for it */ @@ -1128,7 +1175,7 @@ static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file ) *****************************************************************************/ static void DupModule( module_t *p_module ) { - char **pp_shortcut; + const char **pp_shortcut; int i_submodule; for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ ) @@ -1162,7 +1209,7 @@ static void DupModule( module_t *p_module ) *****************************************************************************/ static void UndupModule( module_t *p_module ) { - char **pp_shortcut; + const char **pp_shortcut; int i_submodule; for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) @@ -1172,17 +1219,17 @@ static void UndupModule( module_t *p_module ) for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ ) { - free( *pp_shortcut ); + free( (void *)*pp_shortcut ); } - free( p_module->psz_object_name ); - free( p_module->psz_capability ); - if( p_module->psz_shortname ) free( p_module->psz_shortname ); - free( p_module->psz_longname ); + free( (void *)p_module->psz_object_name ); + free( (void *)p_module->psz_capability ); + if( p_module->psz_shortname ) free( (void *)p_module->psz_shortname ); + free( (void *)p_module->psz_longname ); if( p_module->psz_program != NULL ) { - free( p_module->psz_program ); + free( (void *)p_module->psz_program ); } } @@ -1235,9 +1282,11 @@ 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 ) +static int DeleteModule( module_t * p_module, vlc_bool_t b_detach ) { - vlc_object_detach( p_module ); + if( !p_module ) return VLC_EGENERIC; + if( b_detach ) + vlc_object_detach( p_module ); /* We free the structures that we strdup()ed in Allocate*Module(). */ #ifdef HAVE_DYNAMIC_PLUGINS @@ -1262,7 +1311,7 @@ static int DeleteModule( module_t * p_module ) config_Free( p_module ); vlc_object_destroy( p_module ); - + p_module = NULL; return 0; } @@ -1276,7 +1325,7 @@ static int DeleteModule( module_t * p_module ) *****************************************************************************/ static int CallEntry( module_t * p_module ) { - static char *psz_name = "vlc_entry" MODULE_SUFFIX; + static const char * const psz_name = "vlc_entry" MODULE_SUFFIX; int (* pf_symbol) ( module_t * p_module ); /* Try to resolve the symbol */ @@ -1710,24 +1759,30 @@ static void CacheLoad( vlc_object_t *p_this ) malloc( i_cache * sizeof(void *) ); #define LOAD_IMMEDIATE(a) \ - if( fread( &a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error + if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error #define LOAD_STRING(a) \ - { if( fread( &i_size, sizeof(char), sizeof(i_size), file ) \ - != sizeof(i_size) ) goto error; \ - if( i_size && i_size < 16384 ) { \ - a = malloc( i_size ); \ - if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \ - goto error; \ - if( a[i_size-1] ) { \ - free( a ); a = 0; \ - goto error; } \ - } else a = 0; \ - } while(0) - +{ \ + a = NULL; \ + if( ( fread( &i_size, sizeof(i_size), 1, file ) != 1 ) \ + || ( i_size > 16384 ) ) \ + goto error; \ + if( i_size ) { \ + char *psz = malloc( i_size ); \ + if( fread( psz, i_size, 1, file ) != 1 ) { \ + free( psz ); \ + goto error; \ + } \ + if( psz[i_size-1] ) { \ + free( psz ); \ + goto error; \ + } \ + a = psz; \ + } \ +} for( i = 0; i < i_cache; i++ ) { - int16_t i_size; + uint16_t i_size; int i_submodules; pp_cache[i] = malloc( sizeof(module_cache_t) ); @@ -1738,6 +1793,7 @@ static void CacheLoad( vlc_object_t *p_this ) LOAD_IMMEDIATE( pp_cache[i]->i_time ); LOAD_IMMEDIATE( pp_cache[i]->i_size ); LOAD_IMMEDIATE( pp_cache[i]->b_junk ); + pp_cache[i]->b_used = VLC_FALSE; if( pp_cache[i]->b_junk ) continue; @@ -1803,10 +1859,11 @@ static void CacheLoad( vlc_object_t *p_this ) return; } + int CacheLoadConfig( module_t *p_module, FILE *file ) { - int i, j, i_lines; - int16_t i_size; + uint32_t i_lines; + uint16_t i_size; /* Calculate the structure length */ LOAD_IMMEDIATE( p_module->i_config_items ); @@ -1815,16 +1872,21 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) LOAD_IMMEDIATE( i_lines ); /* Allocate memory */ - p_module->p_config = - (module_config_t *)malloc( sizeof(module_config_t) * (i_lines + 1)); - if( p_module->p_config == NULL ) + if (i_lines) { - msg_Err( p_module, "config error: can't duplicate p_config" ); - return VLC_ENOMEM; + p_module->p_config = + (module_config_t *)calloc( i_lines, sizeof(module_config_t) ); + if( p_module->p_config == NULL ) + { + p_module->confsize = 0; + msg_Err( p_module, "config error: can't duplicate p_config" ); + return VLC_ENOMEM; + } } + p_module->confsize = i_lines; /* Do the duplication job */ - for( i = 0; i < i_lines ; i++ ) + for (size_t i = 0; i < i_lines; i++ ) { LOAD_IMMEDIATE( p_module->p_config[i] ); @@ -1833,16 +1895,23 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) LOAD_STRING( p_module->p_config[i].psz_text ); LOAD_STRING( p_module->p_config[i].psz_longtext ); LOAD_STRING( p_module->p_config[i].psz_current ); - LOAD_STRING( p_module->p_config[i].psz_value_orig ); - - p_module->p_config[i].psz_value = - p_module->p_config[i].psz_value_orig ? - strdup( p_module->p_config[i].psz_value_orig ) : 0; - p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig; - p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig; - p_module->p_config[i].i_value_saved = p_module->p_config[i].i_value; - p_module->p_config[i].f_value_saved = p_module->p_config[i].f_value; - p_module->p_config[i].psz_value_saved = 0; + + if (IsConfigStringType (p_module->p_config[i].i_type)) + { + LOAD_STRING (p_module->p_config[i].orig.psz); + p_module->p_config[i].value.psz = + (p_module->p_config[i].orig.psz != NULL) + ? strdup (p_module->p_config[i].orig.psz) : NULL; + p_module->p_config[i].saved.psz = NULL; + } + else + { + memcpy (&p_module->p_config[i].value, &p_module->p_config[i].orig, + sizeof (p_module->p_config[i].value)); + memcpy (&p_module->p_config[i].saved, &p_module->p_config[i].orig, + sizeof (p_module->p_config[i].saved)); + } + p_module->p_config[i].b_dirty = VLC_FALSE; p_module->p_config[i].p_lock = &p_module->object_lock; @@ -1851,6 +1920,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) { if( p_module->p_config[i].ppsz_list ) { + int j; p_module->p_config[i].ppsz_list = malloc( (p_module->p_config[i].i_list+1) * sizeof(char *)); if( p_module->p_config[i].ppsz_list ) @@ -1862,6 +1932,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) } if( p_module->p_config[i].ppsz_list_text ) { + int j; p_module->p_config[i].ppsz_list_text = malloc( (p_module->p_config[i].i_list+1) * sizeof(char *)); if( p_module->p_config[i].ppsz_list_text ) @@ -1877,7 +1948,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) malloc( (p_module->p_config[i].i_list + 1) * sizeof(int) ); if( p_module->p_config[i].pi_list ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) LOAD_IMMEDIATE( p_module->p_config[i].pi_list[j] ); } } @@ -1890,7 +1961,7 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) p_module->p_config[i].ppsz_action_text = malloc( p_module->p_config[i].i_action * sizeof(char *) ); - for( j = 0; j < p_module->p_config[i].i_action; j++ ) + for (int j = 0; j < p_module->p_config[i].i_action; j++) { p_module->p_config[i].ppf_action[j] = 0; LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] ); @@ -1900,8 +1971,6 @@ int CacheLoadConfig( module_t *p_module, FILE *file ) LOAD_IMMEDIATE( p_module->p_config[i].pf_callback ); } - p_module->p_config[i].i_type = CONFIG_HINT_END; - return VLC_SUCCESS; error: @@ -2007,8 +2076,8 @@ static void CacheSave( vlc_object_t *p_this ) for( i = 0; i < i_cache; i++ ) { - int16_t i_size; - int32_t i_submodule; + uint16_t i_size; + uint32_t i_submodule; /* Save common info */ SAVE_STRING( pp_cache[i]->psz_file ); @@ -2041,7 +2110,8 @@ static void CacheSave( vlc_object_t *p_this ) i_submodule = pp_cache[i]->p_module->i_children; SAVE_IMMEDIATE( i_submodule ); - for( i_submodule = 0; i_submodule < pp_cache[i]->p_module->i_children; + for( i_submodule = 0; + i_submodule < (unsigned)pp_cache[i]->p_module->i_children; i_submodule++ ) { module_t *p_module = @@ -2075,19 +2145,14 @@ static void CacheSave( vlc_object_t *p_this ) void CacheSaveConfig( module_t *p_module, FILE *file ) { - int i, j, i_lines = 0; - module_config_t *p_item; - int16_t i_size; + uint32_t i_lines = p_module->confsize; + uint16_t i_size; SAVE_IMMEDIATE( p_module->i_config_items ); SAVE_IMMEDIATE( p_module->i_bool_items ); - - for( p_item = p_module->p_config; p_item->i_type != CONFIG_HINT_END; - p_item++ ) i_lines++; - SAVE_IMMEDIATE( i_lines ); - for( i = 0; i < i_lines ; i++ ) + for (size_t i = 0; i < i_lines ; i++) { SAVE_IMMEDIATE( p_module->p_config[i] ); @@ -2096,29 +2161,30 @@ void CacheSaveConfig( module_t *p_module, FILE *file ) SAVE_STRING( p_module->p_config[i].psz_text ); SAVE_STRING( p_module->p_config[i].psz_longtext ); SAVE_STRING( p_module->p_config[i].psz_current ); - SAVE_STRING( p_module->p_config[i].psz_value_orig ); + if (IsConfigStringType (p_module->p_config[i].i_type)) + SAVE_STRING( p_module->p_config[i].orig.psz ); if( p_module->p_config[i].i_list ) { if( p_module->p_config[i].ppsz_list ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) SAVE_STRING( p_module->p_config[i].ppsz_list[j] ); } if( p_module->p_config[i].ppsz_list_text ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) SAVE_STRING( p_module->p_config[i].ppsz_list_text[j] ); } if( p_module->p_config[i].pi_list ) { - for( j = 0; j < p_module->p_config[i].i_list; j++ ) + for (int j = 0; j < p_module->p_config[i].i_list; j++) SAVE_IMMEDIATE( p_module->p_config[i].pi_list[j] ); } } - for( j = 0; j < p_module->p_config[i].i_action; j++ ) + for (int j = 0; j < p_module->p_config[i].i_action; j++) SAVE_STRING( p_module->p_config[i].ppsz_action_text[j] ); SAVE_IMMEDIATE( p_module->p_config[i].pf_callback ); @@ -2134,8 +2200,8 @@ static char *CacheName( void ) /* Code int size, pointer size and endianness in the filename */ int32_t x = 0xbe00001e; - sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", sizeof(int), - sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); + sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", (int)sizeof(int), + (int)sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); return psz_cachename; } @@ -2170,7 +2236,7 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, } /***************************************************************************** - * FindPluginCache: finds the cache entry corresponding to a file + * CacheFind: finds the cache entry corresponding to a file *****************************************************************************/ static module_cache_t *CacheFind( vlc_object_t *p_this, char *psz_file, int64_t i_time, int64_t i_size )