commit 799c042daa5b70d064818247fd839c813a48dbbf
author Thierry FOURNIER <tfournier@exceliance.fr> Fri Dec 06 20:36:20 2013 +0100
committer Willy Tarreau <w@1wt.eu> Thu Dec 12 15:42:58 2013 +0100
tree 633bbcef39a34e5ac374ebf359761649f6d5ce31
parent 9645d42d747288b66d7e9c94511e2bfe31a6bc7a

MINOR: regex: Change the struct containing regex

This change permits to remove the typedef. The original regex structs
are set in haproxy's struct.

src/pattern.c

diff --git a/src/pattern.c b/src/pattern.c
index 6d7de52..3ac8f03 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -476,7 +476,7 @@
 /* Parse a regex. It is allocated. */
 int pat_parse_reg(const char **text, struct pattern *pattern, int *opaque, char **err)
 {
-	regex *preg;
+	struct my_regex *preg;
 
 	preg = calloc(1, sizeof(*preg));
 

src/regex.c

diff --git a/src/regex.c b/src/regex.c
index a268996..7a76940 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -122,7 +122,7 @@
 	return NULL;
 }
 
-int regex_comp(const char *str, regex *regex, int cs, int cap, char **err)
+int regex_comp(const char *str, struct my_regex *regex, int cs, int cap, char **err)
 {
 #ifdef USE_PCRE_JIT
 	int flags = 0;
@@ -154,7 +154,7 @@
 	if (!cap)
 		flags |= REG_NOSUB;
 
-	if (regcomp(regex, str, flags) != 0) {
+	if (regcomp(&regex->regex, str, flags) != 0) {
 		memprintf(err, "regex '%s' is invalid", str);
 		return 0;
 	}