From f138a64ad75be1df4b297ed9f82a25085b5102db Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sun, 24 May 2026 20:49:16 +0200 Subject: [PATCH] debug/validate: remove redundant checks Pointed out by cppcheck. --- src/app-layer-htp.c | 2 +- src/output-flow.c | 4 +--- src/output-packet.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c index 0e2eff55d5..7c5278cf20 100644 --- a/src/app-layer-htp.c +++ b/src/app-layer-htp.c @@ -750,7 +750,7 @@ static int Setup(Flow *f, HtpState *hstate) if (NULL == htp) { #ifdef DEBUG_VALIDATION - BUG_ON(htp == NULL); + BUG_ON(1); #endif /* should never happen if HTPConfigure is properly invoked */ goto error; diff --git a/src/output-flow.c b/src/output-flow.c index d707ebdecb..3f9cbd318e 100644 --- a/src/output-flow.c +++ b/src/output-flow.c @@ -95,9 +95,7 @@ TmEcode OutputFlowLog(ThreadVars *tv, void *thread_data, Flow *f) OutputFlowLogger *logger = list; OutputLoggerThreadStore *store = op_thread_data->store; - DEBUG_VALIDATE_BUG_ON(logger == NULL && store != NULL); - DEBUG_VALIDATE_BUG_ON(logger != NULL && store == NULL); - DEBUG_VALIDATE_BUG_ON(logger == NULL && store == NULL); + DEBUG_VALIDATE_BUG_ON(store == NULL); while (logger && store) { DEBUG_VALIDATE_BUG_ON(logger->LogFunc == NULL); diff --git a/src/output-packet.c b/src/output-packet.c index d6b22783ec..6cbcf8186c 100644 --- a/src/output-packet.c +++ b/src/output-packet.c @@ -94,9 +94,7 @@ static TmEcode OutputPacketLog(ThreadVars *tv, Packet *p, void *thread_data) OutputPacketLogger *logger = list; OutputLoggerThreadStore *store = op_thread_data->store; - DEBUG_VALIDATE_BUG_ON(logger == NULL && store != NULL); - DEBUG_VALIDATE_BUG_ON(logger != NULL && store == NULL); - DEBUG_VALIDATE_BUG_ON(logger == NULL && store == NULL); + DEBUG_VALIDATE_BUG_ON(store == NULL); while (logger && store) { DEBUG_VALIDATE_BUG_ON(logger->LogFunc == NULL || logger->ConditionFunc == NULL);