Remove always false b_junk cache entry property

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 6fa81b04f8fb2c4d1f85e00b9265b2745f6926e7..1e8c0ec09c338078693cac10316610d902a2c629 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -58,7 +58,7 @@ static int    CacheLoadConfig  ( module_t *, FILE * );
 
 /* Sub-version number
  * (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 */
 #define CACHENAME_FORMAT \
@@ -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_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 = false;
 
-        if( pp_cache[i]->b_junk ) continue;
-
         pp_cache[i]->p_module = vlc_module_create( p_this );
 
         /* Load additional infos */
@@ -533,9 +530,6 @@ static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
         SAVE_STRING( pp_cache[i]->psz_file );
         SAVE_IMMEDIATE( pp_cache[i]->i_time );
         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_STRING( pp_cache[i]->p_module->psz_object_name );

diff --git a/src/modules/modules.c b/src/modules/modules.c
index aef282251ad099ea36e34c3793233b15175267ec..3651ddb146788a486c245ed5359cd078eb374d98 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -933,10 +933,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
         p_module = AllocatePlugin( p_this, psz_file );
     }
     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;
 
@@ -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]->i_time = i_file_time;
     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]->p_module = p_module;
     p_bank->pp_cache = pp_cache;

diff --git a/src/modules/modules.h b/src/modules/modules.h
index feef97e26da48d10e4ed9dc1e1b3a711047ec53b..d4600c4fd14222882807ab404ace9623f8cb59f0 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -63,7 +63,6 @@ struct module_cache_t
     char       *psz_file;
     int64_t    i_time;
     int64_t    i_size;
-    bool b_junk;
 
     /* Optional extra data */
     bool b_used;