From: Willy Tarreau <w@1wt.eu>
Date: Thu, 19 Apr 2018 08:33:28 +0000 (+0200)
Subject: BUILD: sample: avoid build warning in sample.c
X-Git-Tag: v1.9-dev1~298
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eb2a4addfb25c4a3c99cd6c78101b9ec7469393;p=thirdparty%2Fhaproxy.git

BUILD: sample: avoid build warning in sample.c

Recent commit 9631a28 ("MEDIUM: sample: Extend functionality for field/word
converters") introduced this minor build warning that this patch addresses :

 src/sample.c: In function 'sample_conv_word':
 src/sample.c:2108:8: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
 src/sample.c:2137:8: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]

No backport is needed.
---

diff --git a/src/sample.c b/src/sample.c
index 154beb5cd3..b1c01484fb 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -2105,11 +2105,12 @@ static int sample_conv_word(const struct arg *arg_p, struct sample *smp, void *p
 				}
 			}
 			else if (issep) {
-				if (word == arg_p[0].data.sint)
+				if (word == arg_p[0].data.sint) {
 					if (count == 1)
 						goto found;
 					else if (count > 1)
 						count--;
+				}
 				inword = 0;
 			}
 			start--;
@@ -2134,11 +2135,12 @@ static int sample_conv_word(const struct arg *arg_p, struct sample *smp, void *p
 				}
 			}
 			else if (issep) {
-				if (word == arg_p[0].data.sint)
+				if (word == arg_p[0].data.sint) {
 					if (count == 1)
 						goto found;
 					else if (count > 1)
 						count--;
+				}
 				inword = 0;
 			}
 			end++;