Enable loading "the" cache multiple times

[vlc] / src / modules / cache.c

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 1e8c0ec09c338078693cac10316610d902a2c629..d06a3c5cd849762af7df4500750e9c512b954803 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 9
+#define CACHE_SUBVERSION_NUM 10
 
 /* Format string for the cache filename */
 #define CACHENAME_FORMAT \
@@ -80,10 +80,10 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
 {
     char *psz_filename, *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
     FILE *file;
-    int i, j, i_size, i_read;
+    int j, i_size, i_read;
     char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
-    int i_cache;
-    module_cache_t **pp_cache = 0;
+    unsigned i_cache;
+    module_cache_t **pp_cache = NULL;
     int32_t i_file_size, i_marker;
 
     if( !psz_cachedir ) /* XXX: this should never happen */
@@ -186,7 +186,6 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
         return;
     }
 
-    p_bank->i_loaded_cache = 0;
     if (fread( &i_cache, 1, sizeof(i_cache), file ) != sizeof(i_cache) )
     {
         msg_Warn( p_this, "This doesn't look like a valid plugins cache "
@@ -196,8 +195,18 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
     }
 
     if( i_cache )
-        pp_cache = p_bank->pp_loaded_cache =
-                   xmalloc( i_cache * sizeof(void *) );
+    {
+        unsigned i_already = p_bank->i_loaded_cache;
+        pp_cache = realloc( p_bank->pp_loaded_cache,
+                            (i_already + i_cache) * sizeof(*pp_cache) );
+        if( unlikely(pp_cache == NULL) )
+            i_cache = 0; /* don't load */
+        else
+        {
+            p_bank->pp_loaded_cache = pp_cache;
+            pp_cache += i_already;
+        }
+   }
 
 #define LOAD_IMMEDIATE(a) \
     if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
@@ -221,19 +230,17 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
     } \
 }
 
-    for( i = 0; i < i_cache; i++ )
+    for( unsigned i = 0; i < i_cache; i++ )
     {
         uint16_t i_size;
         int i_submodules;
 
         pp_cache[i] = xmalloc( sizeof(module_cache_t) );
-        p_bank->i_loaded_cache++;
 
         /* Load common info */
         LOAD_STRING( pp_cache[i]->psz_file );
         LOAD_IMMEDIATE( pp_cache[i]->i_time );
         LOAD_IMMEDIATE( pp_cache[i]->i_size );
-        pp_cache[i]->b_used = false;
 
         pp_cache[i]->p_module = vlc_module_create( p_this );
 
@@ -257,6 +264,9 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
             goto error;
 
         LOAD_STRING( pp_cache[i]->p_module->psz_filename );
+        LOAD_STRING( pp_cache[i]->p_module->domain );
+        if( pp_cache[i]->p_module->domain != NULL )
+            vlc_bindtextdomain( pp_cache[i]->p_module->domain );
 
         LOAD_IMMEDIATE( i_submodules );
 
@@ -275,8 +285,10 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
             LOAD_STRING( p_module->psz_capability );
             LOAD_IMMEDIATE( p_module->i_score );
             LOAD_IMMEDIATE( p_module->b_unloadable );
+            LOAD_STRING( p_module->domain );
         }
     }
+    p_bank->i_loaded_cache += i_cache;
 
     fclose( file );
     return;
@@ -286,8 +298,6 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
     msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
 
     /* TODO: cleanup */
-    p_bank->i_loaded_cache = 0;
-
     fclose( file );
     return;
 }
@@ -550,6 +560,7 @@ static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
             goto error;
 
         SAVE_STRING( pp_cache[i]->p_module->psz_filename );
+        SAVE_STRING( pp_cache[i]->p_module->domain );
 
         i_submodule = pp_cache[i]->p_module->submodule_count;
         SAVE_IMMEDIATE( i_submodule );
@@ -586,6 +597,7 @@ static int CacheSaveSubmodule( FILE *file, module_t *p_module )
     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: