commit 9c1d67ecbdb37d1c48d172aeeb3c1d3439fa0e23
author Thierry FOURNIER <tfournier@exceliance.fr> Thu Nov 21 13:37:41 2013 +0100
committer Willy Tarreau <w@1wt.eu> Mon Dec 02 23:31:32 2013 +0100
tree 953de6eff6115b05d2d8c93d297be380b86c42b6
parent e6b11e47c5b5600e529d1d748e9edf3ce6be8f14

MINOR: sample: provide the original sample_conv descriptor struct to the argument checker function.

Note that this argument checker is still unused but will be used by
maps.

src/acl.c

diff --git a/src/acl.c b/src/acl.c
index 9f487a3..9ea082a 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -1277,7 +1277,7 @@
 					if (!conv_expr->arg_p)
 						conv_expr->arg_p = empty_arg_list;
 
-					if (conv->val_args && !conv->val_args(conv_expr->arg_p, &err_msg)) {
+					if (conv->val_args && !conv->val_args(conv_expr->arg_p, conv, &err_msg)) {
 						memprintf(err, "ACL keyword '%s' : invalid args in conv method '%s' : %s.",
 						          expr->kw, ckw, err_msg);
 						free(err_msg);

src/sample.c

diff --git a/src/sample.c b/src/sample.c
index ac0e52a..162c949 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -745,7 +745,7 @@
 			if (!conv_expr->arg_p)
 				conv_expr->arg_p = empty_arg_list;
 
-			if (conv->val_args && !conv->val_args(conv_expr->arg_p, &err_msg)) {
+			if (conv->val_args && !conv->val_args(conv_expr->arg_p, conv, &err_msg)) {
 				snprintf(err, err_size, "invalid args in conv method '%s' : %s.", ckw, err_msg);
 				free(err_msg);
 				goto out_error;