upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-21 22:28:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

BUILD: sample: avoid build warning in sample.c

Browse source 
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.
This commit is contained in:
Willy Tarreau 2018-04-19 10:33:28 +02:00
parent ebaba75429
commit 9eb2a4addf
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sample.c
View file

@ -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++;