summaryrefslogtreecommitdiffstats
path: root/src/file_raw.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2015-05-11 09:25:39 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2015-05-11 09:25:39 +0200
commite1ca4010307fb53d83c5036f6c8269eb9066c928 (patch)
tree79a9547954c70be7ddc88324990d60a163ffb16d /src/file_raw.c
parentf63304053aa32515e4853c2472fb785bcda0307c (diff)
remove always-true memcmp
Diffstat (limited to 'src/file_raw.c')
-rw-r--r--src/file_raw.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/file_raw.c b/src/file_raw.c
index 6dfeac5..12eba46 100644
--- a/src/file_raw.c
+++ b/src/file_raw.c
@@ -30,9 +30,7 @@
#include "types.h"
#include "filegen.h"
-
static void register_header_check_raw(file_stat_t *file_stat);
-static int header_check_raw(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_raw= {
.extension="raw", /* What is the correct extension ? */
@@ -44,23 +42,16 @@ const file_hint_t file_hint_raw= {
.register_header_check=&register_header_check_raw
};
-static const unsigned char raw_header_contax[7]= {'A','R','E','C','O','Y','K'};
-
-static void register_header_check_raw(file_stat_t *file_stat)
-{
- register_header_check(25, raw_header_contax,sizeof(raw_header_contax), &header_check_raw, file_stat);
-}
-
static int header_check_raw(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)
{
/* Contax Kyocera */
- if(memcmp (buffer+25, raw_header_contax, 7)==0)
- {
- reset_file_recovery(file_recovery_new);
- file_recovery_new->extension=file_hint_raw.extension;
- return 1;
- }
- return 0;
+ reset_file_recovery(file_recovery_new);
+ file_recovery_new->extension=file_hint_raw.extension;
+ return 1;
}
-
+static void register_header_check_raw(file_stat_t *file_stat)
+{
+ static const unsigned char raw_header_contax[7]= {'A','R','E','C','O','Y','K'};
+ register_header_check(25, raw_header_contax,sizeof(raw_header_contax), &header_check_raw, file_stat);
+}