summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2013-05-08 10:22:44 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2013-05-08 10:22:44 +0200
commitc7373142a8955fbfe9eacb204c95da1a96e72b21 (patch)
tree9c92f7d6ecb2be4bd36ec56f5a9183ba74831df4 /src
parent40d42f278d7dbf4fe7d7a23a4ca802317bc576a9 (diff)
Fix file copy regression by removing static declaration of file_info_t structure
Diffstat (limited to 'src')
-rw-r--r--src/askloc.c2
-rw-r--r--src/dir.c2
-rw-r--r--src/dirn.c2
-rw-r--r--src/fat_adv.c8
-rw-r--r--src/fat_unformat.c2
-rw-r--r--src/ntfs_fix.c4
-rw-r--r--src/ntfs_udl.c2
-rw-r--r--src/phrecn.c2
8 files changed, 12 insertions, 12 deletions
diff --git a/src/askloc.c b/src/askloc.c
index a1d6050..6e24dd3 100644
--- a/src/askloc.c
+++ b/src/askloc.c
@@ -175,7 +175,7 @@ char *ask_location(const char*msg, const char *src_dir, const char *dst_org)
do
{
DIR* dir;
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/dir.c b/src/dir.c
index aa0c78b..b07cee0 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -272,7 +272,7 @@ static int dir_whole_partition_log_aux(disk_t *disk, const partition_t *partitio
static unsigned int dir_nbr=0;
static unsigned long int inode_known[MAX_DIR_NBR];
const unsigned int current_directory_namelength=strlen(dir_data->current_directory);
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/dirn.c b/src/dirn.c
index bd9a4ff..3b7229b 100644
--- a/src/dirn.c
+++ b/src/dirn.c
@@ -594,7 +594,7 @@ static void copy_dir(WINDOW *window, disk_t *disk, const partition_t *partition,
{
static unsigned int dir_nbr=0;
static unsigned long int inode_known[MAX_DIR_NBR];
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/fat_adv.c b/src/fat_adv.c
index 1455f59..75e7a17 100644
--- a/src/fat_adv.c
+++ b/src/fat_adv.c
@@ -326,7 +326,7 @@ static unsigned int fat32_find_root_cluster(disk_t *disk_car,const partition_t *
#endif
unsigned char *buffer;
int ind_stop=0;
- static file_info_t rootdir_list= {
+ file_info_t rootdir_list= {
.list = TD_LIST_HEAD_INIT(rootdir_list.list),
.name = NULL
};
@@ -373,7 +373,7 @@ static unsigned int fat32_find_root_cluster(disk_t *disk_car,const partition_t *
(buffer[1*0x20+0xB]!=ATTR_EXT && (buffer[1*0x20+0xB]&ATTR_DIR)!=0) && (cluster==0)
&& (buffer[0x40]!=0)) /* First-level directory */
{
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
@@ -504,7 +504,7 @@ static unsigned int fat32_find_root_cluster(disk_t *disk_car,const partition_t *
}
}
{
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
@@ -821,7 +821,7 @@ static int analyse_dir_entries2(disk_t *disk_car,const partition_t *partition, c
{
unsigned char *buffer_dir;
unsigned int root_dir_size;
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/fat_unformat.c b/src/fat_unformat.c
index a10528b..fd7cb61 100644
--- a/src/fat_unformat.c
+++ b/src/fat_unformat.c
@@ -241,7 +241,7 @@ static int fat_unformat_aux(struct ph_param *params, const struct ph_options *op
memcmp(buffer, ". ", 8+3)==0 &&
memcmp(&buffer[0x20], ".. ", 8+3)==0)
{
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/ntfs_fix.c b/src/ntfs_fix.c
index 432954b..48402ed 100644
--- a/src/ntfs_fix.c
+++ b/src/ntfs_fix.c
@@ -171,7 +171,7 @@ int repair_MFT(disk_t *disk_car, partition_t *partition, const int verbose, cons
}
if(res1==0)
{
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
@@ -191,7 +191,7 @@ int repair_MFT(disk_t *disk_car, partition_t *partition, const int verbose, cons
res2=dir_partition_ntfs_init(disk_car,partition,&dir_data,verbose);
if(res2==0)
{
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/ntfs_udl.c b/src/ntfs_udl.c
index b0aec9f..6e495c0 100644
--- a/src/ntfs_udl.c
+++ b/src/ntfs_udl.c
@@ -1661,7 +1661,7 @@ int ntfs_undelete_part(disk_t *disk_car, const partition_t *partition, const int
break;
default:
{
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};
diff --git a/src/phrecn.c b/src/phrecn.c
index eb62a29..9a72e4d 100644
--- a/src/phrecn.c
+++ b/src/phrecn.c
@@ -311,7 +311,7 @@ static int photorec_aux(struct ph_param *params, const struct ph_options *option
if(file_recovery.file_stat->file_hint==&file_hint_dir && options->verbose > 0)
{ /* FAT directory found, list the file */
- static file_info_t dir_list = {
+ file_info_t dir_list = {
.list = TD_LIST_HEAD_INIT(dir_list.list),
.name = NULL
};