BUG/MINOR: cache: Don't needlessly test "cache" keyword in parse_cache_flt()
parse_cache_flt() is the registered callback for the "cache" filter keyword. It
is only called when the "cache" keyword is found on a filter line. So, it is
useless to test the filter name in the callback function.
This patch should fix the issue #634. It may be backported as far as 1.9.
(cherry picked from commit 2a37cdbe6b2cf7e9fa8654ee017af12ceb6015c2)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 4508b775d41f294e3c149a43f2eec70f23bf1782)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/cache.c b/src/cache.c
index 7381ea6..e6b802b 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1767,19 +1767,17 @@
char *name = NULL;
int pos = *cur_arg;
- /* Get the cache filter name*/
- if (!strcmp(args[pos], "cache")) {
- if (!*args[pos + 1]) {
- memprintf(err, "%s : expects an <id> argument", args[pos]);
- goto error;
- }
- name = strdup(args[pos + 1]);
- if (!name) {
- memprintf(err, "%s '%s' : out of memory", args[pos], args[pos + 1]);
- goto error;
- }
- pos += 2;
+ /* Get the cache filter name. <pos> point on "cache" keyword */
+ if (!*args[pos + 1]) {
+ memprintf(err, "%s : expects an <id> argument", args[pos]);
+ goto error;
+ }
+ name = strdup(args[pos + 1]);
+ if (!name) {
+ memprintf(err, "%s '%s' : out of memory", args[pos], args[pos + 1]);
+ goto error;
}
+ pos += 2;
/* Check if an implicit filter with the same name already exists. If so,
* we remove the implicit filter to use the explicit one. */