From eca4d953171ad2f2254824643a5b5394cb66f523 Mon Sep 17 00:00:00 2001 From: "Thierry FOURNIER / OZON.IO" Date: Tue, 22 Nov 2016 22:06:04 +0100 Subject: [PATCH] CLEANUP: log-format: fix return code of the function parse_logformat_var() This patch replaces the successful return code from 0 to 1. The error code is replaced from -1 to 0. The return code of this function is actually unused, so this patch cannot modify the behaviour. --- src/log.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/log.c b/src/log.c index 4f7d78827..3f2b011ea 100644 --- a/src/log.c +++ b/src/log.c @@ -340,6 +340,7 @@ int parse_logformat_var_args(char *args, struct logformat_node *node) * must pass the args part in the pointer with its length in , * and varname with its length in and respectively. is * ignored when arg_len is 0. Neither nor may be null. + * Returns false in error case and err is filled, otherwise returns true. */ int parse_logformat_var(char *arg, int arg_len, char *var, int var_len, struct proxy *curproxy, struct list *list_format, int *defoptions) { @@ -368,7 +369,7 @@ int parse_logformat_var(char *arg, int arg_len, char *var, int var_len, struct p } else { if (logformat_keywords[j].config_callback && logformat_keywords[j].config_callback(node, curproxy) != 0) { - return -1; + return 0; } curproxy->to_log |= logformat_keywords[j].lw; LIST_ADDQ(list_format, &node->list); @@ -377,12 +378,12 @@ int parse_logformat_var(char *arg, int arg_len, char *var, int var_len, struct p Warning("parsing [%s:%d] : deprecated variable '%s' in '%s', please replace it with '%s'.\n", curproxy->conf.args.file, curproxy->conf.args.line, logformat_keywords[j].name, fmt_directive(curproxy), logformat_keywords[j].replace_by); - return 0; + return 1; } else { Warning("parsing [%s:%d] : '%s' : format variable '%s' is reserved for HTTP mode.\n", curproxy->conf.args.file, curproxy->conf.args.line, fmt_directive(curproxy), logformat_keywords[j].name); - return -1; + return 0; } } } @@ -392,7 +393,7 @@ int parse_logformat_var(char *arg, int arg_len, char *var, int var_len, struct p Warning("parsing [%s:%d] : no such format variable '%s' in '%s'. If you wanted to emit the '%%' character verbatim, you need to use '%%%%' in log-format expressions.\n", curproxy->conf.args.file, curproxy->conf.args.line, var, fmt_directive(curproxy)); var[var_len] = j; - return -1; + return 0; } /*