scan-build: treat as debug validate

diff --git a/src/suricata-common.h b/src/suricata-common.h
index 34eb0b7d57143dd17e87dcf65c5191d12c209fa8..a0912c2ce5a44c806d0843f7750357ff5c8c4083 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -36,6 +36,12 @@
 #define _GNU_SOURCE
 #define __USE_GNU
 
+#if defined(__clang_analyzer__)
+/* clang analyzer acts as DEBUG_VALIDATION in some places, so
+ * force this so #ifdef DEBUG_VALIDATION code gets included */
+#define DEBUG_VALIDATION 1
+#endif
+
 #if defined(__has_feature)
 #if __has_feature(address_sanitizer)
 #define SC_ADDRESS_SANITIZER 1

diff --git a/src/util-validate.h b/src/util-validate.h
index 011e1bd0aec7cdcbf85dc2ad9daaec89927bc5da..c0dac20b78be49c3faee614af57d6a017389936a 100644 (file)
--- a/src/util-validate.h
+++ b/src/util-validate.h
@@ -96,15 +96,6 @@
 
 #define DEBUG_VALIDATE_BUG_ON(exp) BUG_ON((exp))
 
-#elif defined(__clang_analyzer__)
-
-#define DEBUG_ASSERT_FLOW_LOCKED(f)
-#define DEBUG_VALIDATE_FLOW(f)
-#define DEBUG_VALIDATE_PACKET(p)
-#define DEBUG_VALIDATE_BUG_ON(exp) BUG_ON((exp))
-/* define macro so we also get #ifdef DEBUG_VALIDATION code */
-#define DEBUG_VALIDATION           1
-
 #else /* DEBUG_VALIDATE */
 
 #define DEBUG_ASSERT_FLOW_LOCKED(f)