From 4de2cda1042a227195f0bbac772636cfa43b829d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 2 Mar 2022 14:53:00 +0100 Subject: [PATCH] BUILD: trace: do not declare trace_registre_source() inline This one is referenced in initcalls by its pointer, it makes no sense to declare it inline. At best it causes function duplication, at worst it doesn't build on older compilers. --- include/haproxy/trace.h | 17 ++--------------- src/trace.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/haproxy/trace.h b/include/haproxy/trace.h index 50857a071..caf82a664 100644 --- a/include/haproxy/trace.h +++ b/include/haproxy/trace.h @@ -130,6 +130,8 @@ void __trace(enum trace_level level, uint64_t mask, struct trace_source *src, const void *a1, const void *a2, const void *a3, const void *a4), const struct ist msg); +void trace_register_source(struct trace_source *source); + /* return a single char to describe a trace state */ static inline char trace_state_char(enum trace_state st) { @@ -144,21 +146,6 @@ static inline char trace_event_char(uint64_t conf, uint64_t ev) return (conf & ev) ? '+' : '-'; } -/* registers trace source . Modifies the list element! - * The {start,pause,stop,report} events are not changed so the source may - * preset them. - */ -static inline void trace_register_source(struct trace_source *source) -{ - source->lockon = TRACE_LOCKON_NOTHING; - source->level = TRACE_LEVEL_USER; - source->verbosity = 1; - source->sink = NULL; - source->state = TRACE_STATE_STOPPED; - source->lockon_ptr = NULL; - LIST_APPEND(&trace_sources, &source->source_link); -} - #endif /* _HAPROXY_TRACE_H */ /* diff --git a/src/trace.c b/src/trace.c index 15e01487f..8a3985406 100644 --- a/src/trace.c +++ b/src/trace.c @@ -265,6 +265,21 @@ void __trace(enum trace_level level, uint64_t mask, struct trace_source *src, } } +/* registers trace source . Modifies the list element! + * The {start,pause,stop,report} events are not changed so the source may + * preset them. + */ +void trace_register_source(struct trace_source *source) +{ + source->lockon = TRACE_LOCKON_NOTHING; + source->level = TRACE_LEVEL_USER; + source->verbosity = 1; + source->sink = NULL; + source->state = TRACE_STATE_STOPPED; + source->lockon_ptr = NULL; + LIST_APPEND(&trace_sources, &source->source_link); +} + struct trace_source *trace_find_source(const char *name) { struct trace_source *src;