commit ecfb8e8ff96aa3d5bbb99052b010096d66fdd833
author Willy Tarreau <w@1wt.eu> Fri Apr 20 12:29:52 2012 +0200
committer Willy Tarreau <w@1wt.eu> Tue May 08 20:57:12 2012 +0200
tree 3a3ca5142fe9d35b5ef15a746c9336a41de462d8
parent 0146c2e873bcfd00bc9db952791edbe105268958

MEDIUM: pattern: replace type pattern_arg with type arg

arg is more complete than pattern_arg since it also covers ACL args,
so let's use this one instead.

src/pattern.c

diff --git a/src/pattern.c b/src/pattern.c
index 78728f6..cae85a8 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -476,30 +476,30 @@
 	return p;
 }
 
-/* Converts an argument string mask to a pattern_arg type IP.
+/* Converts an argument string mask to a arg type IP.
  * Returns non-zero in case of success, 0 on error.
  */
-int pattern_arg_ipmask(const char *arg_str, struct pattern_arg **arg_p, int *arg_i)
+int pattern_arg_ipmask(const char *arg_str, struct arg **arg_p, int *arg_i)
 {
 	*arg_i = 1;
-	*arg_p = calloc(1, *arg_i*sizeof(struct pattern_arg));
-	(*arg_p)->type = PATTERN_ARG_TYPE_IP;
+	*arg_p = calloc(1, *arg_i*sizeof(struct arg));
+	(*arg_p)->type = ARGT_IPV4;
 
-	if (!str2mask(arg_str, &(*arg_p)->data.ip))
+	if (!str2mask(arg_str, &(*arg_p)->data.ipv4))
 		return 0;
 
 	return 1;
 }
 
 
-/* Converts an argument string to a pattern_arg type STRING.
+/* Converts an argument string to a arg type STRING.
  * Returns non-zero in case of success, 0 on error.
  */
-int pattern_arg_str(const char *arg_str, struct pattern_arg **arg_p, int *arg_i)
+int pattern_arg_str(const char *arg_str, struct arg **arg_p, int *arg_i)
 {
 	*arg_i = 1;
-	*arg_p = calloc(1, *arg_i*sizeof(struct pattern_arg));
-	(*arg_p)->type = PATTERN_ARG_TYPE_STRING;
+	*arg_p = calloc(1, *arg_i*sizeof(struct arg));
+	(*arg_p)->type = ARGT_STR;
 	(*arg_p)->data.str.str = strdup(arg_str);
 	(*arg_p)->data.str.len = strlen(arg_str);
 
@@ -512,7 +512,7 @@
 /*    Pattern format convert functions                           */
 /*****************************************************************/
 
-static int pattern_conv_str2lower(const struct pattern_arg *arg_p, int arg_i, union pattern_data *data)
+static int pattern_conv_str2lower(const struct arg *arg_p, int arg_i, union pattern_data *data)
 {
 	int i;
 
@@ -526,7 +526,7 @@
 	return 1;
 }
 
-static int pattern_conv_str2upper(const struct pattern_arg *arg_p, int arg_i, union pattern_data *data)
+static int pattern_conv_str2upper(const struct arg *arg_p, int arg_i, union pattern_data *data)
 {
 	int i;
 
@@ -541,9 +541,9 @@
 }
 
 /* takes the netmask in arg_i */
-static int pattern_conv_ipmask(const struct pattern_arg *arg_p, int arg_i, union pattern_data *data)
+static int pattern_conv_ipmask(const struct arg *arg_p, int arg_i, union pattern_data *data)
 {
-	data->ip.s_addr &= arg_p->data.ip.s_addr;
+	data->ip.s_addr &= arg_p->data.ipv4.s_addr;
 	return 1;
 }