From: Rémi Denis-Courmont <remi@remlab.net>
Date: Mon, 9 Nov 2009 21:40:03 +0000 (+0200)
Subject: Remove language from plugin cache
X-Git-Tag: 1.1.0-ff~2536
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=75dcb251c6fb8fcb002c47c6f15a334770c30d15;p=vlc

Remove language from plugin cache
---

diff --git a/src/modules/cache.c b/src/modules/cache.c
index dba50d52a4..09968d724b 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -84,7 +84,7 @@ static int    CacheSaveConfig  ( module_t *, FILE * );
 
 /* Sub-version number
  * (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 4
+#define CACHE_SUBVERSION_NUM 5
 
 /* Format string for the cache filename */
 #define CACHENAME_FORMAT \
@@ -108,7 +108,6 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
     FILE *file;
     int i, j, i_size, i_read;
     char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
-    char p_cachelang[6], p_lang[6];
     int i_cache;
     module_cache_t **pp_cache = 0;
     int32_t i_file_size, i_marker;
@@ -208,17 +207,6 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
         return;
     }
 
-    /* Check the language hasn't changed */
-    sprintf( p_lang, "%5.5s", _("C") ); i_size = 5;
-    i_read = fread( p_cachelang, 1, i_size, file );
-    if( i_read != i_size || memcmp( p_cachelang, p_lang, i_size ) )
-    {
-        msg_Warn( p_this, "This doesn't look like a valid plugins cache "
-                  "(language changed)" );
-        fclose( file );
-        return;
-    }
-
     /* Check header marker */
     i_read = fread( &i_marker, 1, sizeof(i_marker), file );
     if( i_read != sizeof(i_marker) ||
@@ -531,10 +519,6 @@ void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
     if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1 )
         goto error;
 
-    /* Language */
-    if (fprintf (file, "%5.5s", _("C")) == EOF)
-        goto error;
-
     /* Header marker */
     i_file_size = ftell( file );
     if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)