/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 15
+#define CACHE_SUBVERSION_NUM 18
/* Cache filename */
#define CACHE_NAME "plugins.dat"
* actually load the dynamically loadable module.
* This allows us to only fully load plugins when they are actually used.
*/
-size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t ***r )
+size_t CacheLoad( vlc_object_t *p_this, const char *dir, module_cache_t **r )
{
char *psz_filename;
FILE *file;
return 0;
}
- module_cache_t **pp_cache = NULL;
+ module_cache_t *cache = NULL;
#define LOAD_IMMEDIATE(a) \
if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
uint16_t i_size;
int i_submodules;
- module = vlc_module_create();
+ module = vlc_module_create (NULL);
/* Load additional infos */
- free (module->psz_object_name);
- LOAD_STRING(module->psz_object_name);
LOAD_STRING(module->psz_shortname);
LOAD_STRING(module->psz_longname);
LOAD_STRING(module->psz_help);
LOAD_IMMEDIATE(module->i_shortcuts);
if (module->i_shortcuts > MODULE_SHORTCUT_MAX)
goto error;
- else if (module->i_shortcuts == 0)
- module->pp_shortcuts = NULL;
else
{
module->pp_shortcuts =
if (CacheLoadConfig (module, file) != VLC_SUCCESS)
goto error;
- LOAD_STRING(module->psz_filename);
LOAD_STRING(module->domain);
if (module->domain != NULL)
vlc_bindtextdomain (module->domain);
while( i_submodules-- )
{
- module_t *submodule = vlc_submodule_create (module);
- free (submodule->psz_object_name);
+ module_t *submodule = vlc_module_create (module);
free (submodule->pp_shortcuts);
- LOAD_STRING(submodule->psz_object_name);
LOAD_STRING(submodule->psz_shortname);
LOAD_STRING(submodule->psz_longname);
- LOAD_STRING(submodule->psz_help);
LOAD_IMMEDIATE(submodule->i_shortcuts);
if (submodule->i_shortcuts > MODULE_SHORTCUT_MAX)
goto error;
- else if (submodule->i_shortcuts == 0)
- submodule->pp_shortcuts = NULL;
else
{
submodule->pp_shortcuts =
LOAD_STRING(submodule->psz_capability);
LOAD_IMMEDIATE(submodule->i_score);
- LOAD_IMMEDIATE(submodule->b_unloadable);
- LOAD_STRING(submodule->domain);
}
char *path;
/* Load common info */
LOAD_STRING(path);
+ if (path == NULL)
+ goto error;
LOAD_IMMEDIATE(st.st_mtime);
LOAD_IMMEDIATE(st.st_size);
- CacheAdd (&pp_cache, &count, path, &st, module);
+ CacheAdd (&cache, &count, path, &st, module);
free (path);
/* TODO: deal with errors */
}
fclose( file );
- *r = pp_cache;
+ *r = cache;
return i_cache;
error:
LOAD_STRING( p_module->p_config[i].psz_name );
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_oldname );
if (IsConfigStringType (p_module->p_config[i].i_type))
{
return VLC_EGENERIC;
}
-static int CacheSaveBank( FILE *file, module_cache_t *const *, size_t );
+static int CacheSaveBank( FILE *file, const module_cache_t *, size_t );
/**
* Saves a module cache to disk, and release cache data from memory.
*/
void CacheSave (vlc_object_t *p_this, const char *dir,
- module_cache_t **entries, size_t n)
+ module_cache_t *entries, size_t n)
{
char *filename = NULL, *tmpname = NULL;
free (tmpname);
for (size_t i = 0; i < n; i++)
- {
- free (entries[i]->path);
- free (entries[i]);
- }
+ free (entries[i].path);
free (entries);
}
static int CacheSaveConfig (FILE *, const module_t *);
static int CacheSaveSubmodule (FILE *, const module_t *);
-static int CacheSaveBank (FILE *file, module_cache_t *const *pp_cache,
+static int CacheSaveBank (FILE *file, const module_cache_t *cache,
size_t i_cache)
{
uint32_t i_file_size = 0;
for (unsigned i = 0; i < i_cache; i++)
{
+ module_t *module = cache[i].p_module;
uint32_t i_submodule;
/* Save additional infos */
- SAVE_STRING( pp_cache[i]->p_module->psz_object_name );
- SAVE_STRING( pp_cache[i]->p_module->psz_shortname );
- SAVE_STRING( pp_cache[i]->p_module->psz_longname );
- SAVE_STRING( pp_cache[i]->p_module->psz_help );
- SAVE_IMMEDIATE( pp_cache[i]->p_module->i_shortcuts );
- for (unsigned j = 0; j < pp_cache[i]->p_module->i_shortcuts; j++)
- SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] );
-
- SAVE_STRING( pp_cache[i]->p_module->psz_capability );
- SAVE_IMMEDIATE( pp_cache[i]->p_module->i_score );
- SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
+ SAVE_STRING(module->psz_shortname);
+ SAVE_STRING(module->psz_longname);
+ SAVE_STRING(module->psz_help);
+ SAVE_IMMEDIATE(module->i_shortcuts);
+ for (unsigned j = 0; j < module->i_shortcuts; j++)
+ SAVE_STRING(module->pp_shortcuts[j]);
+
+ SAVE_STRING(module->psz_capability);
+ SAVE_IMMEDIATE(module->i_score);
+ SAVE_IMMEDIATE(module->b_unloadable);
/* Config stuff */
- if (CacheSaveConfig (file, pp_cache[i]->p_module))
+ if (CacheSaveConfig (file, module))
goto error;
- SAVE_STRING( pp_cache[i]->p_module->psz_filename );
- SAVE_STRING( pp_cache[i]->p_module->domain );
+ SAVE_STRING(module->domain);
- i_submodule = pp_cache[i]->p_module->submodule_count;
+ i_submodule = module->submodule_count;
SAVE_IMMEDIATE( i_submodule );
- if( CacheSaveSubmodule( file, pp_cache[i]->p_module->submodule ) )
+ if (CacheSaveSubmodule (file, module->submodule))
goto error;
/* Save common info */
- SAVE_STRING(pp_cache[i]->path);
- SAVE_IMMEDIATE(pp_cache[i]->mtime);
- SAVE_IMMEDIATE(pp_cache[i]->size);
+ SAVE_STRING(cache[i].path);
+ SAVE_IMMEDIATE(cache[i].mtime);
+ SAVE_IMMEDIATE(cache[i].size);
}
if (fflush (file)) /* flush libc buffers */
if( CacheSaveSubmodule( file, p_module->next ) )
goto error;
- SAVE_STRING( p_module->psz_object_name );
SAVE_STRING( p_module->psz_shortname );
SAVE_STRING( p_module->psz_longname );
- SAVE_STRING( p_module->psz_help );
SAVE_IMMEDIATE( p_module->i_shortcuts );
for( unsigned j = 0; j < p_module->i_shortcuts; j++ )
SAVE_STRING( p_module->pp_shortcuts[j] );
SAVE_STRING( p_module->psz_capability );
SAVE_IMMEDIATE( p_module->i_score );
- SAVE_IMMEDIATE( p_module->b_unloadable );
- SAVE_STRING( p_module->domain );
return 0;
error:
SAVE_STRING( p_module->p_config[i].psz_name );
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_oldname );
if (IsConfigStringType (p_module->p_config[i].i_type))
SAVE_STRING( p_module->p_config[i].orig.psz );
/**
* Looks up a plugin file in a table of cached plugins.
*/
-module_t *CacheFind (module_cache_t *const *entries, size_t count,
+module_t *CacheFind (module_cache_t *cache, size_t count,
const char *path, const struct stat *st)
{
while (count > 0)
{
- module_cache_t *entry = *(entries++);
-
- if (!strcmp (entry->path, path)
- && entry->mtime == st->st_mtime
- && entry->size == st->st_size)
+ if (cache->path != NULL
+ && !strcmp (cache->path, path)
+ && cache->mtime == st->st_mtime
+ && cache->size == st->st_size)
{
- module_t *module = entry->p_module;
- entry->p_module = NULL; /* Return NULL next time */
+ module_t *module = cache->p_module;
+ cache->p_module = NULL;
return module;
}
+ cache++;
count--;
}
}
/** Adds entry to the cache */
-int CacheAdd (module_cache_t ***cache, size_t *count,
+int CacheAdd (module_cache_t **cachep, size_t *countp,
const char *path, const struct stat *st, module_t *module)
{
- module_cache_t **entries;
+ module_cache_t *cache = *cachep;
+ const size_t count = *countp;
- entries = realloc (*cache, (*count + 1) * sizeof (*entries));
- if (unlikely(entries == NULL))
+ cache = realloc (cache, (count + 1) * sizeof (*cache));
+ if (unlikely(cache == NULL))
return -1;
- *cache = entries;
+ *cachep = cache;
- entries[*count] = malloc (sizeof (**entries));
- if (unlikely(entries[*count] == NULL))
- return -1;
+ cache += count;
/* NOTE: strdup() could be avoided, but it would be a bit ugly */
- entries[*count]->path = strdup (path);
- entries[*count]->mtime = st->st_mtime;
- entries[*count]->size = st->st_size;
- entries[*count]->p_module = module;
- (*count)++;
+ cache->path = strdup (path);
+ cache->mtime = st->st_mtime;
+ cache->size = st->st_size;
+ cache->p_module = module;
+ *countp = count + 1;
return 0;
}
projects / vlc / blobdiff