From: Thierry FOURNIER / OZON.IO <thierry.fournier@ozon.io>
Date: Tue, 22 Nov 2016 22:13:04 +0000 (+0100)
Subject: CLEANUP: log-format: fix return code of function parse_logformat_var_args()
X-Git-Tag: v1.7.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bca46f0d9df6def5f4cf81d83d8fd9fe522696ee;p=thirdparty%2Fhaproxy.git

CLEANUP: log-format: fix return code of function parse_logformat_var_args()

This patch replace 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.
---

diff --git a/src/log.c b/src/log.c
index 3f2b011ea6..0fee934efc 100644
--- a/src/log.c
+++ b/src/log.c
@@ -286,7 +286,8 @@ int prepare_addrsource(struct logformat_node *node, struct proxy *curproxy)
 
 
 /*
- * Parse args in a logformat_var
+ * Parse args in a logformat_var. Returns 0 in error
+ * case, otherwise, it returns 1.
  */
 int parse_logformat_var_args(char *args, struct logformat_node *node)
 {
@@ -296,7 +297,7 @@ int parse_logformat_var_args(char *args, struct logformat_node *node)
 	char *sp = NULL; // start pointer
 
 	if (args == NULL)
-		return 1;
+		return 0;
 
 	while (1) {
 		if (*args == '\0')
@@ -332,7 +333,7 @@ int parse_logformat_var_args(char *args, struct logformat_node *node)
 		}
 		args++;
 	}
-	return 0;
+	return 1;
 }
 
 /*