summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/file_ext2.c4
-rw-r--r--src/file_indd.c4
-rw-r--r--src/file_jpg.c24
-rw-r--r--src/file_mp3.c4
-rw-r--r--src/file_par2.c4
-rw-r--r--src/file_pct.c4
-rw-r--r--src/file_plist.c4
-rw-r--r--src/file_psf.c4
-rw-r--r--src/file_tiff.c8
-rw-r--r--src/file_wtv.c4
10 files changed, 32 insertions, 32 deletions
diff --git a/src/file_ext2.c b/src/file_ext2.c
index 4c77219..7bc31a9 100644
--- a/src/file_ext2.c
+++ b/src/file_ext2.c
@@ -63,8 +63,8 @@ static int header_check_ext2_fs(const unsigned char *buffer, const unsigned int
file_recovery->file_stat->file_hint==&file_hint_ext2_fs &&
file_recovery->calculated_file_size==(uint64_t)le32(sb->s_blocks_count)*(EXT2_MIN_BLOCK_SIZE<<le32(sb->s_log_block_size)))
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_ext2_fs.extension;
diff --git a/src/file_indd.c b/src/file_indd.c
index 4b6bb2c..6c4bb8f 100644
--- a/src/file_indd.c
+++ b/src/file_indd.c
@@ -125,8 +125,8 @@ static int header_check_indd(const unsigned char *buffer, const unsigned int buf
file_recovery->file_stat->file_hint==&file_hint_indd &&
file_recovery->file_size <= 8192)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
#ifdef DJGPP
diff --git a/src/file_jpg.c b/src/file_jpg.c
index 6ac841c..518beff 100644
--- a/src/file_jpg.c
+++ b/src/file_jpg.c
@@ -389,8 +389,8 @@ static int header_check_jpg(const unsigned char *buffer, const unsigned int buff
jpg_get_size(buffer, buffer_size, &height, &width);
if(file_recovery->file_stat->file_hint==&file_hint_indd)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
if(file_recovery->file_stat->file_hint==&file_hint_doc &&
strstr(file_recovery->filename, ".albm")!=NULL)
@@ -407,28 +407,28 @@ static int header_check_jpg(const unsigned char *buffer, const unsigned int buff
log_info("jpg %llu %llu\n",
(long long unsigned)file_recovery->calculated_file_size,
(long long unsigned)file_recovery->file_size);
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
/* Don't recover the thumb instead of the jpg itself */
if(file_recovery->file_size <= 4096 &&
buffer[3]==0xe0 &&
width>0 && width<200 && height>0 && height<200)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
/* Some JPG have two APP1 markers, avoid to dicard the first one */
if( buffer[3]==0xe1 &&
memcmp(&buffer[6], "http://ns.adobe.com/xap/", 24)==0)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
if(file_recovery->file_check==&file_check_mpo)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
}
/* Don't extract jpg inside AVI */
@@ -450,8 +450,8 @@ static int header_check_jpg(const unsigned char *buffer, const unsigned int buff
if( file_recovery->file_stat->file_hint==&file_hint_rw2 &&
file_recovery->file_size <= 8192)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
if(buffer[3]==0xdb) /* DQT */
{
diff --git a/src/file_mp3.c b/src/file_mp3.c
index b2414fc..cddcbb0 100644
--- a/src/file_mp3.c
+++ b/src/file_mp3.c
@@ -175,8 +175,8 @@ static int header_check_mp3(const unsigned char *buffer, const unsigned int buff
if(file_recovery->file_stat->file_hint==&file_hint_tiff &&
buffer[0]==buffer[3] && buffer[1]==buffer[4] && buffer[2]==buffer[5])
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
}
while(potential_frame_offset+1 < buffer_size &&
diff --git a/src/file_par2.c b/src/file_par2.c
index 0af6954..2cb5fa0 100644
--- a/src/file_par2.c
+++ b/src/file_par2.c
@@ -113,8 +113,8 @@ static int header_check_par2(const unsigned char *buffer, const unsigned int buf
if(file_recovery->file_stat!=NULL &&
file_recovery->file_stat->file_hint==&file_hint_par2)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_par2.extension;
diff --git a/src/file_pct.c b/src/file_pct.c
index 49899c9..4983705 100644
--- a/src/file_pct.c
+++ b/src/file_pct.c
@@ -97,8 +97,8 @@ static int header_check_pct(const unsigned char *buffer, const unsigned int buff
if(file_recovery->file_stat != NULL &&
file_recovery->file_stat->file_hint==&file_hint_indd)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_pct.extension;
diff --git a/src/file_plist.c b/src/file_plist.c
index fdb0ae0..63e5767 100644
--- a/src/file_plist.c
+++ b/src/file_plist.c
@@ -51,8 +51,8 @@ static int header_check_plist(const unsigned char *buffer, const unsigned int bu
if( file_recovery->file_stat->file_hint==&file_hint_qbb ||
file_recovery->file_stat->file_hint==&file_hint_sqlite)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
}
reset_file_recovery(file_recovery_new);
diff --git a/src/file_psf.c b/src/file_psf.c
index 657cbb2..e30308f 100644
--- a/src/file_psf.c
+++ b/src/file_psf.c
@@ -46,8 +46,8 @@ static int header_check_psf(const unsigned char *buffer, const unsigned int buff
if(file_recovery->file_stat!=NULL &&
file_recovery->file_stat->file_hint==&file_hint_psf)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_psf.extension;
diff --git a/src/file_tiff.c b/src/file_tiff.c
index cb10015..a0df566 100644
--- a/src/file_tiff.c
+++ b/src/file_tiff.c
@@ -319,8 +319,8 @@ static int header_check_tiff_be_new(const unsigned char *buffer, const unsigned
if(file_recovery->file_stat!=NULL &&
file_recovery->file_stat->file_hint==&file_hint_jpg)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_tiff.extension;
@@ -367,8 +367,8 @@ static int header_check_tiff_le_new(const unsigned char *buffer, const unsigned
if(file_recovery->file_stat!=NULL &&
file_recovery->file_stat->file_hint==&file_hint_jpg)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_tiff.extension;
diff --git a/src/file_wtv.c b/src/file_wtv.c
index 711570e..5b8e9bb 100644
--- a/src/file_wtv.c
+++ b/src/file_wtv.c
@@ -53,8 +53,8 @@ static int header_check_wtv(const unsigned char *buffer, const unsigned int buff
file_recovery->file_stat->file_hint==&file_hint_wtv &&
file_recovery->file_size<=0x3000)
{
- header_ignored(file_recovery_new);
- return 0;
+ if(header_ignored_adv(file_recovery, file_recovery_new)==0)
+ return 0;
}
reset_file_recovery(file_recovery_new);
file_recovery_new->extension=file_hint_wtv.extension;