From 754aeae1e8d174af0255e61e62345fe7e4b8b4f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 27 Jan 2010 19:12:17 +0200 Subject: [PATCH] Remove always false b_junk cache entry property --- src/modules/cache.c | 8 +------- src/modules/modules.c | 5 ----- src/modules/modules.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/modules/cache.c b/src/modules/cache.c index 6fa81b04f8..1e8c0ec09c 100644 --- 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 aef282251a..3651ddb146 100644 --- 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 feef97e26d..d4600c4fd1 100644 --- 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; -- 2.39.2