summaryrefslogtreecommitdiffstats
path: root/src/file_res.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_res.c
parentf63304053aa32515e4853c2472fb785bcda0307c (diff)
remove always-true memcmp
Diffstat (limited to 'src/file_res.c')
-rw-r--r--src/file_res.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/file_res.c b/src/file_res.c
index 5efb1ec..728bf75 100644
--- a/src/file_res.c
+++ b/src/file_res.c
@@ -31,7 +31,6 @@
#include "filegen.h"
static void register_header_check_res(file_stat_t *file_stat);
-static int header_check_res(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_res= {
.extension="res",
@@ -43,21 +42,16 @@ const file_hint_t file_hint_res= {
.register_header_check=&register_header_check_res
};
-static const unsigned char MS_res_header[14]= {0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
- 0xFF, 0xFF, 0, 0, 0xFF, 0xFF};
-
-static void register_header_check_res(file_stat_t *file_stat)
+static int header_check_res(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)
{
- register_header_check(0, MS_res_header,sizeof(MS_res_header), &header_check_res, file_stat);
+ reset_file_recovery(file_recovery_new);
+ file_recovery_new->extension=file_hint_res.extension;
+ return 1;
}
-static int header_check_res(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)
+static void register_header_check_res(file_stat_t *file_stat)
{
- if(memcmp(buffer,MS_res_header,sizeof(MS_res_header))==0)
- {
- reset_file_recovery(file_recovery_new);
- file_recovery_new->extension=file_hint_res.extension;
- return 1;
- }
- return 0;
+ static const unsigned char MS_res_header[14]= {0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+ 0xFF, 0xFF, 0, 0, 0xFF, 0xFF};
+ register_header_check(0, MS_res_header,sizeof(MS_res_header), &header_check_res, file_stat);
}