]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
projects / thirdparty / haproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14518f2)
CLEANUP: vars: make smp_fetch_var() to reuse vars_get_by_desc()
authorDragan Dosen <ddosen@haproxy.com>
Mon, 22 Feb 2021 16:39:02 +0000 (17:39 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 23 Feb 2021 16:23:53 +0000 (17:23 +0100)
They both do the same thing, so let's remove unneeded code duplication.

src/vars.c patch | blob | blame | history

diff --git a/src/vars.c b/src/vars.c
index 251ffe12160e5a607ed359216441e4479b8f5247..3da44300293a4c1af8a00299bd1b94b07a7fac8d 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -332,31 +332,8 @@ static inline struct var *var_get(struct vars *vars, const char *name)
 static int smp_fetch_var(const struct arg *args, struct sample *smp, const char *kw, void *private)
 {
        const struct var_desc *var_desc = &args[0].data.var;
-       struct var *var;
-       struct vars *vars;
-
-       /* Check the availibity of the variable. */
-       vars = get_vars(smp->sess, smp->strm, var_desc->scope);
-       if (!vars || vars->scope != var_desc->scope)
-               return 0;
 
-       HA_RWLOCK_RDLOCK(VARS_LOCK, &vars->rwlock);
-       var = var_get(vars, var_desc->name);
-
-       /* check for the variable avalaibility */
-       if (!var) {
-               HA_RWLOCK_RDUNLOCK(VARS_LOCK, &vars->rwlock);
-               return 0;
-       }
-
-       /* Duplicate the sample data because it could modified by another
-        * thread */
-       smp->data = var->data;
-       smp_dup(smp);
-       smp->flags |= SMP_F_CONST;
-
-       HA_RWLOCK_RDUNLOCK(VARS_LOCK, &vars->rwlock);
-       return 1;
+       return vars_get_by_desc(var_desc, smp);
 }
 
 /* This function search in the <head> a variable with the same
Mirror of https://github.com/haproxy/haproxy.git