]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
scan-build: simplify FatalErrorOnInit macro
authorVictor Julien <victor@inliniac.net>
Thu, 21 Dec 2017 10:10:52 +0000 (11:10 +0100)
committerVictor Julien <victor@inliniac.net>
Thu, 21 Dec 2017 12:34:27 +0000 (13:34 +0100)
src/util-debug.h

index e0e06420ce87ec536d8cfd9e9bb0e4fa51e9c548..cfd096660c69c2249cd734faff3ba263ed560112 100644 (file)
@@ -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);