From: Victor Julien <victor@inliniac.net>
Date: Thu, 21 Dec 2017 10:10:52 +0000 (+0100)
Subject: scan-build: simplify FatalErrorOnInit macro
X-Git-Tag: suricata-4.1.0-beta1~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a4b5adce88a5ee265ac545e2f7bdb5bc70ef7c3;p=thirdparty%2Fsuricata.git

scan-build: simplify FatalErrorOnInit macro
---

diff --git a/src/util-debug.h b/src/util-debug.h
index e0e06420ce..cfd096660c 100644
--- a/src/util-debug.h
+++ b/src/util-debug.h
@@ -541,6 +541,7 @@ extern int sc_log_module_cleaned;
 
 /** \brief Fatal error IF we're starting up, and configured to consider
  *         errors to be fatal errors */
+#if !defined(__clang_analyzer__)
 #define FatalErrorOnInit(x, ...) do {                                       \
     int init_errors_fatal = 0;                                              \
     ConfGetBool("engine.init-failure-fatal", &init_errors_fatal);           \
@@ -551,7 +552,10 @@ extern int sc_log_module_cleaned;
     }                                                                       \
     SCLogWarning(x, __VA_ARGS__);                                           \
 } while(0)
-
+/* make it simpler for scan-build */
+#else
+#define FatalErrorOnInit(x, ...) FatalError(x, __VA_ARGS__)
+#endif
 
 SCLogInitData *SCLogAllocLogInitData(void);