From 342fa8ee26f1d00ec7d27fdeeb51d402a01add8d Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Fri, 27 Sep 2019 16:28:54 -0600 Subject: [PATCH] magic/test: remove NULL as format string Remove passing NULL as a format string parameter in test. Convert to FAIL_IF_NULL. --- src/util-magic.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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; -- 2.47.2