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

src/file_jpg.c: remove logically dead code

Browse source
This commit is contained in:
Christophe Grenier 2014-02-02 15:22:10 +01:00
parent 5b0b6e820b
commit 4510835e94
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/file_jpg.c
View file

@ -1586,15 +1586,6 @@ static data_check_t data_check_jpg2(const unsigned char *buffer, const unsigned
file_recovery->data_check=&data_check_jpg; file_recovery->data_check=&data_check_jpg;
return data_check_jpg(buffer, buffer_size, file_recovery); return data_check_jpg(buffer, buffer_size, file_recovery);
} }
if(buffer[buffer_size/2]==0xff && buffer[buffer_size/2]==0xd8 &&
file_recovery->calculated_file_size != file_recovery->file_size)
{
#ifdef DEBUG_JPEG
log_info("%s data_check_jpg2 0xffd8 at 0x%llx\n", file_recovery->filename,
(long long unsigned)file_recovery->calculated_file_size);
#endif
return DC_STOP;
}
while(file_recovery->calculated_file_size + buffer_size/2 > file_recovery->file_size && while(file_recovery->calculated_file_size + buffer_size/2 > file_recovery->file_size &&
file_recovery->calculated_file_size < file_recovery->file_size + buffer_size/2) file_recovery->calculated_file_size < file_recovery->file_size + buffer_size/2)
{ {
@ -1641,12 +1632,6 @@ static data_check_t data_check_jpg2(const unsigned char *buffer, const unsigned
data_check_t data_check_jpg(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery) data_check_t data_check_jpg(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
{ {
if(buffer[buffer_size/2]==0xff && buffer[buffer_size/2]==0xd8 &&
file_recovery->calculated_file_size != file_recovery->file_size)
{
log_info("data_check_jpg ffd8\n");
return DC_STOP;
}
/* Skip the SOI */ /* Skip the SOI */
if(file_recovery->calculated_file_size==0) if(file_recovery->calculated_file_size==0)
file_recovery->calculated_file_size+=2; file_recovery->calculated_file_size+=2;