summaryrefslogtreecommitdiffstats
path: root/src/file_xm.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_xm.c
parentf63304053aa32515e4853c2472fb785bcda0307c (diff)
remove always-true memcmp
Diffstat (limited to 'src/file_xm.c')
-rw-r--r--src/file_xm.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/src/file_xm.c b/src/file_xm.c
index 5b18e96..33f29d8 100644
--- a/src/file_xm.c
+++ b/src/file_xm.c
@@ -34,7 +34,6 @@
#include "log.h"
static void register_header_check_xm(file_stat_t *file_stat);
-static int header_check_xm(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_xm= {
.extension="xm",
@@ -180,22 +179,17 @@ static void file_check_xm(file_recovery_t *fr)
}
-static const unsigned char xm_header[17] = { 'E','x','t','e','n','d','e','d',' ','M','o','d','u','l','e',':',' '};
-
-static void register_header_check_xm(file_stat_t *file_stat)
+static int header_check_xm(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, xm_header,sizeof(xm_header), &header_check_xm, file_stat);
+ reset_file_recovery(file_recovery_new);
+ file_recovery_new->extension=file_hint_xm.extension;
+ file_recovery_new->min_filesize=336 + 29; /* Header + 1 instrument */
+ file_recovery_new->file_check=&file_check_xm;
+ return 1;
}
-static int header_check_xm(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_xm(file_stat_t *file_stat)
{
- if(memcmp(buffer,xm_header,sizeof(xm_header))==0)
- {
- reset_file_recovery(file_recovery_new);
- file_recovery_new->extension=file_hint_xm.extension;
- file_recovery_new->min_filesize=336 + 29; /* Header + 1 instrument */
- file_recovery_new->file_check=&file_check_xm;
- return 1;
- }
- return 0;
+ static const unsigned char xm_header[17] = { 'E','x','t','e','n','d','e','d',' ','M','o','d','u','l','e',':',' '};
+ register_header_check(0, xm_header,sizeof(xm_header), &header_check_xm, file_stat);
}