Since commit bfbd2deae0c3 ("flow: Handle NULL (unknown) flows in flow
logging functions"), type_or_state is only used in the branch handling
non-NULL flows, and cppcheck points out that its scope can be reduced,
causing 'make cppcheck' to fail. We do that here.
Fixes: bfbd2deae0c3 ("flow: Handle NULL (unknown) flows in flow logging functions")
Signed-off-by: Jon Maloy
---
flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/flow.c b/flow.c
index 27a24a4c..f9fbaefe 100644
--- a/flow.c
+++ b/flow.c
@@ -286,7 +286,6 @@ int flowside_connect(const struct ctx *c, int s,
void flow_log__(const struct flow_common *f, int pri, bool perror, bool details,
enum flow_state state, const char *fmt, ...)
{
- const char *type_or_state;
int errno_ = errno;
char msg[BUFSIZ];
va_list args;
@@ -299,6 +298,8 @@ void flow_log__(const struct flow_common *f, int pri, bool perror, bool details,
logmsg(!perror, false, pri, "Flow: not found, error: %s", msg);
details = false;
} else {
+ const char *type_or_state;
+
/* Show type if it's set, otherwise the state */
if (f->state < FLOW_STATE_TYPED)
type_or_state = FLOW_STATE(f);
--
2.56.1