From 7f37bf4cd51fc73441aeee1acf0129f4802e0cba Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 16 Jan 2024 11:50:39 +1100 Subject: flow: Move flow_log_() to near top of flow.c flow_log_() is a very basic widely used function that many other functions in flow.c will end up needing. At present it's below flow_table_compact() which happens not to need it, but that's likely to change. Move it to near the top of flow.c to avoid forward declarations. Code motion only, no changes. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- flow.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flow.c b/flow.c index 5dd5d2b..a710e50 100644 --- a/flow.c +++ b/flow.c @@ -31,6 +31,24 @@ union flow flowtab[FLOW_MAX]; /* Last time the flow timers ran */ static struct timespec flow_timer_run; +/** flow_log_ - Log flow-related message + * @f: flow the message is related to + * @pri: Log priority + * @fmt: Format string + * @...: printf-arguments + */ +void flow_log_(const struct flow_common *f, int pri, const char *fmt, ...) +{ + char msg[BUFSIZ]; + va_list args; + + va_start(args, fmt); + (void)vsnprintf(msg, sizeof(msg), fmt, args); + va_end(args); + + logmsg(pri, "Flow %u (%s): %s", flow_idx(f), FLOW_TYPE(f), msg); +} + /** * flow_table_compact() - Perform compaction on flow table * @c: Execution context @@ -70,24 +88,6 @@ void flow_table_compact(struct ctx *c, union flow *hole) memset(from, 0, sizeof(*from)); } -/** flow_log_ - Log flow-related message - * @f: flow the message is related to - * @pri: Log priority - * @fmt: Format string - * @...: printf-arguments - */ -void flow_log_(const struct flow_common *f, int pri, const char *fmt, ...) -{ - char msg[BUFSIZ]; - va_list args; - - va_start(args, fmt); - (void)vsnprintf(msg, sizeof(msg), fmt, args); - va_end(args); - - logmsg(pri, "Flow %u (%s): %s", flow_idx(f), FLOW_TYPE(f), msg); -} - /** * flow_defer_handler() - Handler for per-flow deferred and timed tasks * @c: Execution context -- cgit v1.2.3