From abb873d294b9b90aef43f19e885d4fff934b0ac4 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 8 Dec 2013 14:44:45 +0100 Subject: [PATCH] src/file_one.c: code cleanup --- src/file_one.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/file_one.c b/src/file_one.c index 4f67dad8..5a99eff2 100644 --- a/src/file_one.c +++ b/src/file_one.c @@ -31,7 +31,6 @@ #include "filegen.h" static void register_header_check_one(file_stat_t *file_stat); -static int header_check_one(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); const file_hint_t file_hint_one= { .extension="one", @@ -43,26 +42,21 @@ const file_hint_t file_hint_one= { .register_header_check=®ister_header_check_one }; -static const unsigned char one_header[16]= { - 0xe4, 0x52, 0x5c, 0x7b, 0x8c, 0xd8, 0xa7, 0x4d, - 0xae, 0xb1, 0x53, 0x78, 0xd0, 0x29, 0x96, 0xd3 }; +static int header_check_one(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) +{ + reset_file_recovery(file_recovery_new); + file_recovery_new->extension=file_hint_one.extension; + file_recovery_new->min_filesize=200; + file_recovery_new->calculated_file_size=(buffer[196]<<0)+(buffer[197]<<8)+(buffer[198]<<16)+((uint64_t)buffer[199]<<24); + file_recovery_new->data_check=&data_check_size; + file_recovery_new->file_check=&file_check_size; + return 1; +} static void register_header_check_one(file_stat_t *file_stat) { + static const unsigned char one_header[16]= { + 0xe4, 0x52, 0x5c, 0x7b, 0x8c, 0xd8, 0xa7, 0x4d, + 0xae, 0xb1, 0x53, 0x78, 0xd0, 0x29, 0x96, 0xd3 }; register_header_check(0, one_header,sizeof(one_header), &header_check_one, file_stat); } - -static int header_check_one(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) -{ - if(memcmp(buffer,one_header,sizeof(one_header))==0) - { - reset_file_recovery(file_recovery_new); - file_recovery_new->extension=file_hint_one.extension; - file_recovery_new->min_filesize=200; - file_recovery_new->calculated_file_size=(buffer[196]<<0)+(buffer[197]<<8)+(buffer[198]<<16)+(buffer[199]<<24); - file_recovery_new->data_check=&data_check_size; - file_recovery_new->file_check=&file_check_size; - return 1; - } - return 0; -}