remove always-true memcmp

1 files changed, 14 insertions, 23 deletions

diff --git a/src/file_ifo.c b/src/file_ifo.c
index f30939f2..69f42e81 100644
--- a/src/file_ifo.c
+++ b/src/file_ifo.c
@@ -32,7 +32,6 @@
 #include "common.h"
 
 static void register_header_check_ifo(file_stat_t *file_stat);
-static int header_check_ifo(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_ifo= {
   .extension="ifo",
@@ -44,15 +43,6 @@ const file_hint_t file_hint_ifo= {
   .register_header_check=&register_header_check_ifo
 };
 
-static const unsigned char ifo_header_vmg[12]=  { 'D', 'V', 'D', 'V', 'I', 'D', 'E', 'O', '-', 'V', 'M', 'G'};
-static const unsigned char ifo_header_vts[12]=  { 'D', 'V', 'D', 'V', 'I', 'D', 'E', 'O', '-', 'V', 'T', 'S'};
-
-static void register_header_check_ifo(file_stat_t *file_stat)
-{
-  register_header_check(0, ifo_header_vmg, sizeof(ifo_header_vmg), &header_check_ifo, file_stat);
-  register_header_check(0, ifo_header_vts, sizeof(ifo_header_vts), &header_check_ifo, file_stat);
-}
-
 struct ifo_hdr
 {
   char 	   name[12];
@@ -62,18 +52,19 @@ struct ifo_hdr
 
 static int header_check_ifo(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, ifo_header_vmg, sizeof(ifo_header_vmg))==0 ||
-    memcmp(buffer, ifo_header_vts, sizeof(ifo_header_vts))==0)
-  {
-    const struct ifo_hdr *hdr=(const struct ifo_hdr *)buffer;
-    reset_file_recovery(file_recovery_new);
-    file_recovery_new->extension=file_hint_ifo.extension;
-    file_recovery_new->calculated_file_size=((uint64_t)be32(hdr->ls_IFO)+1)*2048;
-    file_recovery_new->data_check=&data_check_size;
-    file_recovery_new->file_check=&file_check_size;
-    return 1;
-  }
-  return 0;
+  const struct ifo_hdr *hdr=(const struct ifo_hdr *)buffer;
+  reset_file_recovery(file_recovery_new);
+  file_recovery_new->extension=file_hint_ifo.extension;
+  file_recovery_new->calculated_file_size=((uint64_t)be32(hdr->ls_IFO)+1)*2048;
+  file_recovery_new->data_check=&data_check_size;
+  file_recovery_new->file_check=&file_check_size;
+  return 1;
 }
 
-
+static void register_header_check_ifo(file_stat_t *file_stat)
+{
+  static const unsigned char ifo_header_vmg[12]=  { 'D', 'V', 'D', 'V', 'I', 'D', 'E', 'O', '-', 'V', 'M', 'G'};
+  static const unsigned char ifo_header_vts[12]=  { 'D', 'V', 'D', 'V', 'I', 'D', 'E', 'O', '-', 'V', 'T', 'S'};
+  register_header_check(0, ifo_header_vmg, sizeof(ifo_header_vmg), &header_check_ifo, file_stat);
+  register_header_check(0, ifo_header_vts, sizeof(ifo_header_vts), &header_check_ifo, file_stat);
+}