From 2a4b5adce88a5ee265ac545e2f7bdb5bc70ef7c3 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 21 Dec 2017 11:10:52 +0100 Subject: [PATCH] scan-build: simplify FatalErrorOnInit macro --- src/util-debug.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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);