Commit 754aeae1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove always false b_junk cache entry property

parent 38430d10
...@@ -58,7 +58,7 @@ static int CacheLoadConfig ( module_t *, FILE * ); ...@@ -58,7 +58,7 @@ static int CacheLoadConfig ( module_t *, FILE * );
/* Sub-version number /* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */ * (only used to avoid breakage in dev version when cache structure changes) */
#define CACHE_SUBVERSION_NUM 8 #define CACHE_SUBVERSION_NUM 9
/* Format string for the cache filename */ /* Format string for the cache filename */
#define CACHENAME_FORMAT \ #define CACHENAME_FORMAT \
...@@ -233,11 +233,8 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete ) ...@@ -233,11 +233,8 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
LOAD_STRING( pp_cache[i]->psz_file ); LOAD_STRING( pp_cache[i]->psz_file );
LOAD_IMMEDIATE( pp_cache[i]->i_time ); LOAD_IMMEDIATE( pp_cache[i]->i_time );
LOAD_IMMEDIATE( pp_cache[i]->i_size ); LOAD_IMMEDIATE( pp_cache[i]->i_size );
LOAD_IMMEDIATE( pp_cache[i]->b_junk );
pp_cache[i]->b_used = false; pp_cache[i]->b_used = false;
if( pp_cache[i]->b_junk ) continue;
pp_cache[i]->p_module = vlc_module_create( p_this ); pp_cache[i]->p_module = vlc_module_create( p_this );
/* Load additional infos */ /* Load additional infos */
...@@ -533,9 +530,6 @@ static int CacheSaveBank (FILE *file, module_bank_t *p_bank) ...@@ -533,9 +530,6 @@ static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
SAVE_STRING( pp_cache[i]->psz_file ); SAVE_STRING( pp_cache[i]->psz_file );
SAVE_IMMEDIATE( pp_cache[i]->i_time ); SAVE_IMMEDIATE( pp_cache[i]->i_time );
SAVE_IMMEDIATE( pp_cache[i]->i_size ); SAVE_IMMEDIATE( pp_cache[i]->i_size );
SAVE_IMMEDIATE( pp_cache[i]->b_junk );
if( pp_cache[i]->b_junk ) continue;
/* Save additional infos */ /* Save additional infos */
SAVE_STRING( pp_cache[i]->p_module->psz_object_name ); SAVE_STRING( pp_cache[i]->p_module->psz_object_name );
......
...@@ -933,10 +933,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, ...@@ -933,10 +933,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
p_module = AllocatePlugin( p_this, psz_file ); p_module = AllocatePlugin( p_this, psz_file );
} }
else else
/* If junk dll, don't try to load it */
if( p_cache_entry->b_junk )
return -1;
else
{ {
module_config_t *p_item = NULL, *p_end = NULL; module_config_t *p_item = NULL, *p_end = NULL;
...@@ -986,7 +982,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank, ...@@ -986,7 +982,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file ); pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file );
pp_cache[p_bank->i_cache]->i_time = i_file_time; pp_cache[p_bank->i_cache]->i_time = i_file_time;
pp_cache[p_bank->i_cache]->i_size = i_file_size; pp_cache[p_bank->i_cache]->i_size = i_file_size;
pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1;
pp_cache[p_bank->i_cache]->b_used = true; pp_cache[p_bank->i_cache]->b_used = true;
pp_cache[p_bank->i_cache]->p_module = p_module; pp_cache[p_bank->i_cache]->p_module = p_module;
p_bank->pp_cache = pp_cache; p_bank->pp_cache = pp_cache;
......
...@@ -63,7 +63,6 @@ struct module_cache_t ...@@ -63,7 +63,6 @@ struct module_cache_t
char *psz_file; char *psz_file;
int64_t i_time; int64_t i_time;
int64_t i_size; int64_t i_size;
bool b_junk;
/* Optional extra data */ /* Optional extra data */
bool b_used; bool b_used;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment