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

MINOR: vars: Make vars_(un|)set_by_name(_ifexist|) return a success value

Browse Source 
Change the return type from `void` to `int` and return whether setting
the variable was successful.
This commit is contained in:
Tim Duesterhus 2020-05-19 13:49:40 +02:00 committed by Christopher Faulet
parent 7329327333
commit b4fac1eb3c
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/vars.h
View File

@ -7,9 +7,9 @@ void vars_init(struct vars *vars, enum vars_scope scope);
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);
void vars_set_by_name_ifexist(const char *name, size_t len, struct sample *smp);
void vars_set_by_name(const char *name, size_t len, struct sample *smp);
void vars_unset_by_name_ifexist(const char *name, size_t len, struct sample *smp);
int vars_set_by_name_ifexist(const char *name, size_t len, struct sample *smp);
int vars_set_by_name(const char *name, size_t len, struct sample *smp);
int vars_unset_by_name_ifexist(const char *name, size_t len, struct sample *smp);
int vars_get_by_desc(const struct var_desc *var_desc, struct sample *smp);
int vars_check_arg(struct arg *arg, char **err);

25
src/vars.c
View File

@ -538,49 +538,50 @@ int vars_check_arg(struct arg *arg, char **err)
}
/* This function store a sample in a variable if it was already defined.
* In error case, it fails silently.
* Returns zero on failure and non-zero otherwise. The variable not being
* defined is treated as a failure.
*/
void vars_set_by_name_ifexist(const char *name, size_t len, struct sample *smp)
int vars_set_by_name_ifexist(const char *name, size_t len, struct sample *smp)
{
enum vars_scope scope;
/* Resolve name and scope. */
name = register_name(name, len, &scope, 0, NULL);
if (!name)
return;
return 0;
sample_store_stream(name, scope, smp);
return sample_store_stream(name, scope, smp);
}
/* This function store a sample in a variable.
* In error case, it fails silently.
* Returns zero on failure and non-zero otherwise.
*/
void vars_set_by_name(const char *name, size_t len, struct sample *smp)
int vars_set_by_name(const char *name, size_t len, struct sample *smp)
{
enum vars_scope scope;
/* Resolve name and scope. */
name = register_name(name, len, &scope, 1, NULL);
if (!name)
return;
return 0;
sample_store_stream(name, scope, smp);
return sample_store_stream(name, scope, smp);
}
/* This function unset a variable if it was already defined.
* In error case, it fails silently.
* Returns zero on failure and non-zero otherwise.
*/
void vars_unset_by_name_ifexist(const char *name, size_t len, struct sample *smp)
int vars_unset_by_name_ifexist(const char *name, size_t len, struct sample *smp)
{
enum vars_scope scope;
/* Resolve name and scope. */
name = register_name(name, len, &scope, 0, NULL);
if (!name)
return;
return 0;
sample_clear_stream(name, scope, smp);
return sample_clear_stream(name, scope, smp);
}