RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-28 00:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: pattern: make pat_ref_add() rely on pat_ref_append()

Browse Source 
Let's remove unneeded code duplication, both are exactly the same.
This commit is contained in:
Willy Tarreau 2020-10-28 10:58:05 +01:00
parent f4edb72e0a
commit 6a1740767c
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pattern.c
View File

@ -1982,9 +1982,9 @@ int pat_ref_push(struct pat_ref_elt *elt, struct pattern_expr *expr,
return 1;
}
/* This function adds entry to <ref>. It can failed with memory error. The new
/* This function adds entry to <ref>. It can fail on memory error. The new
* entry is added at all the pattern_expr registered in this reference. The
* function stop on the first error encountered. It returns 0 and err is
* function stops on the first error encountered. It returns 0 and <err> is
* filled. If an error is encountered, the complete add operation is cancelled.
* If the insertion is a success the function returns 1.
*/
@ -1995,36 +1995,12 @@ int pat_ref_add(struct pat_ref *ref,
struct pat_ref_elt *elt;
struct pattern_expr *expr;
elt = malloc(sizeof(*elt));
elt = pat_ref_append(ref, pattern, sample, -1);
if (!elt) {
memprintf(err, "out of memory error");
return 0;
}
elt->line = -1;
elt->pattern = strdup(pattern);
if (!elt->pattern) {
free(elt);
memprintf(err, "out of memory error");
return 0;
}
if (sample) {
elt->sample = strdup(sample);
if (!elt->sample) {
free(elt->pattern);
free(elt);
memprintf(err, "out of memory error");
return 0;
}
}
else
elt->sample = NULL;
LIST_INIT(&elt->back_refs);
LIST_ADDQ(&ref->head, &elt->list);
list_for_each_entry(expr, &ref->pat, list) {
if (!pat_ref_push(elt, expr, 0, err)) {
/* If the insertion fails, try to delete all the added entries. */
@ -2032,7 +2008,6 @@ int pat_ref_add(struct pat_ref *ref,
return 0;
}
}
return 1;
}