From: Willy Tarreau <w@1wt.eu>
Date: Fri, 3 Sep 2021 12:20:32 +0000 (+0200)
Subject: BUILD: ot: add argument for default value to vars_get_by_name()
X-Git-Tag: v2.5-dev6~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c36d0938c71a7fa635db3a339de59477825db08;p=thirdparty%2Fhaproxy.git

BUILD: ot: add argument for default value to vars_get_by_name()

The API was extended by commit e352b9dac ("MINOR: vars: make vars_get_by_*
support an optional default value") but I didn't notice that opentracing
was using it, so it broke the build. No backport needed.
---

diff --git a/addons/ot/src/vars.c b/addons/ot/src/vars.c
index fff54acac5..dd823b1a71 100644
--- a/addons/ot/src/vars.c
+++ b/addons/ot/src/vars.c
@@ -452,7 +452,7 @@ int flt_ot_var_get(struct stream *s, const char *scope, const char *prefix, cons
 	(void)memset(&smp, 0, sizeof(smp));
 	(void)smp_set_owner(&smp, s->be, s->sess, s, opt | SMP_OPT_FINAL);
 
-	if (vars_get_by_name(var_name, retval, &smp)) {
+	if (vars_get_by_name(var_name, retval, &smp, NULL)) {
 		retval = flt_ot_sample_to_str(&(smp.data), var_value, sizeof(var_value), err);
 		if (retval != -1)
 			FLT_OT_DBG(3, "data type %d: '%s' = '%s'", smp.data.type, var_name, var_value);