From: Miroslav Zagorac Date: Wed, 9 Dec 2020 15:34:29 +0000 (+0100) Subject: MINOR: vars: replace static functions with global ones X-Git-Tag: v2.4-dev4~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6deab79d59e834dd8e2e432d7726eb067c60f919;p=thirdparty%2Fhaproxy.git MINOR: vars: replace static functions with global ones The OpenTracing filter uses several internal HAProxy functions to work with variables and therefore requires two static local HAProxy functions, var_accounting_diff() and var_clear(), to be declared global. In fact, the var_clear() function was not originally defined as static, but it lacked a declaration. --- diff --git a/include/haproxy/vars.h b/include/haproxy/vars.h index 1d0a47abb9..aeb218a72d 100644 --- a/include/haproxy/vars.h +++ b/include/haproxy/vars.h @@ -28,6 +28,8 @@ #include void vars_init(struct vars *vars, enum vars_scope scope); +void var_accounting_diff(struct vars *vars, struct session *sess, struct stream *strm, int size); +unsigned int var_clear(struct var *var); void vars_prune(struct vars *vars, struct session *sess, struct stream *strm); void vars_prune_per_sess(struct vars *vars); int vars_get_by_name(const char *name, size_t len, struct sample *smp); diff --git a/src/vars.c b/src/vars.c index b847b5d37e..e3289996bd 100644 --- a/src/vars.c +++ b/src/vars.c @@ -65,7 +65,7 @@ static inline struct vars *get_vars(struct session *sess, struct stream *strm, e /* This function adds or remove memory size from the accounting. The inner * pointers may be null when setting the outer ones only. */ -static void var_accounting_diff(struct vars *vars, struct session *sess, struct stream *strm, int size) +void var_accounting_diff(struct vars *vars, struct session *sess, struct stream *strm, int size) { switch (vars->scope) { case SCOPE_REQ: