From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 27 Sep 2019 22:28:54 +0000 (-0600)
Subject: magic/test: remove NULL as format string
X-Git-Tag: suricata-5.0.0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342fa8ee26f1d00ec7d27fdeeb51d402a01add8d;p=thirdparty%2Fsuricata.git

magic/test: remove NULL as format string

Remove passing NULL as a format string parameter
in test. Convert to FAIL_IF_NULL.
---

diff --git a/src/util-magic.c b/src/util-magic.c
index 9e1179747c..69a4f1056f 100644
--- a/src/util-magic.c
+++ b/src/util-magic.c
@@ -344,10 +344,7 @@ static int MagicDetectTest03(void)
     FAIL_IF_NULL(result);
 
     char *str = strstr(result, "OpenDocument Text");
-    if (str == NULL) {
-        printf("result %s, not \"OpenDocument Text\": ", str);
-        FAIL;
-    }
+    FAIL_IF_NULL(str);
 
     magic_close(magic_ctx);
     PASS;
@@ -517,10 +514,7 @@ static int MagicDetectTest07(void)
     FAIL_IF_NULL(result);
 
     char *str = strstr(result, "OpenDocument Text");
-    if (str == NULL) {
-        printf("result %s, not \"OpenDocument Text\": ", str);
-        FAIL;
-    }
+    FAIL_IF_NULL(str);
 
     MagicDeinit();
     PASS;