Commit 55003f1d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove endianess and type sizes from plugin name

On the one hand, plugins from different architectures cannot be mixed
in the same installation directory as they have the same names.
On the other hand, endianess and type sizes is way insufficient to
discriminate architectures (e.g. armel and i386 look the same).

So this was totally useless. And it did not need to be formatted at
run-time either.
parent 706a49d8
...@@ -60,12 +60,9 @@ static int CacheLoadConfig ( module_t *, FILE * ); ...@@ -60,12 +60,9 @@ static int CacheLoadConfig ( module_t *, FILE * );
* (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 12 #define CACHE_SUBVERSION_NUM 12
/* Format string for the cache filename */ /* Cache filename */
#define CACHENAME_FORMAT \ #define CACHE_NAME "plugins.dat"
"plugins-%.2zx%.2zx%.2"PRIx8".dat"
/* Magic for the cache filename */ /* Magic for the cache filename */
#define CACHENAME_VALUES \
sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e }
#define CACHE_STRING "cache "PACKAGE_NAME" "PACKAGE_VERSION #define CACHE_STRING "cache "PACKAGE_NAME" "PACKAGE_VERSION
...@@ -75,8 +72,7 @@ void CacheDelete( vlc_object_t *obj, const char *dir ) ...@@ -75,8 +72,7 @@ void CacheDelete( vlc_object_t *obj, const char *dir )
assert( dir != NULL ); assert( dir != NULL );
if( asprintf( &path, "%s"DIR_SEP CACHENAME_FORMAT, if( asprintf( &path, "%s"DIR_SEP CACHE_NAME, dir ) == -1 )
dir, CACHENAME_VALUES ) == -1 )
return; return;
msg_Dbg( obj, "removing plugins cache file %s", path ); msg_Dbg( obj, "removing plugins cache file %s", path );
vlc_unlink( path ); vlc_unlink( path );
...@@ -106,8 +102,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir ) ...@@ -106,8 +102,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
if( !p_bank->b_cache ) if( !p_bank->b_cache )
return; return;
if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT, if( asprintf( &psz_filename, "%s"DIR_SEP CACHE_NAME, dir ) == -1 )
dir, CACHENAME_VALUES ) == -1 )
return; return;
msg_Dbg( p_this, "loading plugins cache file %s", psz_filename ); msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
...@@ -444,8 +439,7 @@ void CacheSave (vlc_object_t *p_this, const char *dir, ...@@ -444,8 +439,7 @@ void CacheSave (vlc_object_t *p_this, const char *dir,
{ {
char *filename, *tmpname; char *filename, *tmpname;
if (asprintf (&filename, "%s"DIR_SEP CACHENAME_FORMAT, dir, if (asprintf (&filename, "%s"DIR_SEP CACHE_NAME, dir ) == -1)
CACHENAME_VALUES ) == -1)
return; return;
if (asprintf (&tmpname, "%s.%"PRIu32, filename, (uint32_t)getpid ()) == -1) if (asprintf (&tmpname, "%s.%"PRIu32, filename, (uint32_t)getpid ()) == -1)
......
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