luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

src/file_zip.c: move several static variables to the top

Browse source
This commit is contained in:
Christophe Grenier 2021-03-18 17:24:08 +01:00
parent a3bbfdfdcb
commit 21aaeadf8a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/file_zip.c
View file

@ -49,6 +49,10 @@ extern const file_hint_t file_hint_doc;
static void register_header_check_zip(file_stat_t *file_stat); static void register_header_check_zip(file_stat_t *file_stat);
static unsigned int pos_in_mem(const unsigned char *haystack, const unsigned int haystack_size, const unsigned char *needle, const unsigned int needle_size); static unsigned int pos_in_mem(const unsigned char *haystack, const unsigned int haystack_size, const unsigned char *needle, const unsigned int needle_size);
static char first_filename[256]; static char first_filename[256];
static uint64_t expected_compressed_size=0;
static int msoffice=0;
static int sh3d=0;
static const char *ext_msoffice=NULL;
const file_hint_t file_hint_zip= { const file_hint_t file_hint_zip= {
.extension="zip", .extension="zip",
@ -184,8 +188,6 @@ struct zip64_end_central_dir
typedef struct zip_file_entry zip_file_entry_t; typedef struct zip_file_entry zip_file_entry_t;
typedef struct zip64_extra_entry zip64_extra_entry_t; typedef struct zip64_extra_entry zip64_extra_entry_t;
static uint64_t expected_compressed_size=0;
/*@ /*@
@ requires \valid(f); @ requires \valid(f);
@ requires 0 < size <= 4096; @ requires 0 < size <= 4096;
@ -359,9 +361,6 @@ static int zip_parse_file_entry_fn(file_recovery_t *fr, const char **ext, const
#endif #endif
if(*ext==NULL) if(*ext==NULL)
{ {
static int msoffice=0;
static int sh3d=0;
static const char *ext_msoffice=NULL;
if(file_nbr==0) if(file_nbr==0)
{ {
msoffice=0; msoffice=0;