summaryrefslogtreecommitdiffstats
path: root/src/file_psp.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2013-12-14 21:36:24 +0100
committerChristophe Grenier <grenier@cgsecurity.org>2013-12-14 21:40:04 +0100
commit3213247d998d58627eb4029afce6be8680de3b30 (patch)
tree96d4a64aca2201410703b5c15589715fe1557aa1 /src/file_psp.c
parent5de0329f2184bdf89e087f414b651448df096c1f (diff)
PhotoRec: use an enum for values returned by data_check()
rename .m2ts and .ts using pid from header
Diffstat (limited to 'src/file_psp.c')
-rw-r--r--src/file_psp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/file_psp.c b/src/file_psp.c
index f5ad532..f961f33 100644
--- a/src/file_psp.c
+++ b/src/file_psp.c
@@ -55,7 +55,7 @@ struct psp_chunk {
uint32_t size;
} __attribute__ ((__packed__));
-static int data_check_psp(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
+static data_check_t data_check_psp(const unsigned char *buffer, const unsigned int buffer_size, file_recovery_t *file_recovery)
{
while(file_recovery->calculated_file_size + buffer_size/2 >= file_recovery->file_size &&
file_recovery->calculated_file_size + 10 < file_recovery->file_size + buffer_size/2)
@@ -63,12 +63,12 @@ static int data_check_psp(const unsigned char *buffer, const unsigned int buffer
const unsigned int i=file_recovery->calculated_file_size - file_recovery->file_size + buffer_size/2;
const struct psp_chunk *chunk=(const struct psp_chunk *)&buffer[i];
if(memcmp(&buffer[i], "~BK\0", 4) != 0)
- return 2;
+ return DC_STOP;
/* chunk: header, id, total_length */
file_recovery->calculated_file_size+=10;
file_recovery->calculated_file_size+=le32(chunk->size);
}
- return 1;
+ return DC_CONTINUE;
}
static int header_check_psp(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)