1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: vars: make smp_fetch_var() to reuse vars_get_by_desc()

Browse Source 
They both do the same thing, so let's remove unneeded code duplication.
This commit is contained in:
Dragan Dosen 2021-02-22 17:39:02 +01:00 committed by Willy Tarreau
parent 14518f2305
commit ec0a604f27
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vars.c
View File

@ -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) 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; const struct var_desc *var_desc = &args[0].data.var;
struct var *var;
struct vars *vars;
/* Check the availibity of the variable. */ return vars_get_by_desc(var_desc, smp);
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;
} }
/* This function search in the <head> a variable with the same /* This function search in the <head> a variable with the same