mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: cli: clear a maybe-unused warning on some older compilers

Browse Source 
The SHOW_TOT() and SHOW_AVG() macros used in cli_io_handler_show_activity()
produce a warning on gcc 4.7 on MIPS with threads disabled because the
compiler doesn't know that global.nbthread is necessarily non-null, hence
that at least one iteration is performed. Let's just change the loop for
a do {} while () that lets the compiler know it's always initialized. It
also has the tiny benefit of making the code shorter.
This commit is contained in:
Willy Tarreau 2021-11-20 19:17:38 +01:00
parent f897fc99bd
commit 97b5d07a3e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli.c
View File

@ -1368,8 +1368,10 @@ static int cli_io_handler_show_activity(struct appctx *appctx)
unsigned int _v[MAX_THREADS]; \
unsigned int _tot; \
const unsigned int _nbt = global.nbthread; \
for (_tot = t = 0; t < _nbt; t++) \
_tot = t = 0; \
do { \
_tot += _v[t] = (x); \
} while (++t < _nbt); \
if (_nbt == 1) { \
chunk_appendf(&trash, " %u\n", _tot); \
break; \
@ -1386,8 +1388,10 @@ static int cli_io_handler_show_activity(struct appctx *appctx)
unsigned int _v[MAX_THREADS]; \
unsigned int _tot; \
const unsigned int _nbt = global.nbthread; \
for (_tot = t = 0; t < _nbt; t++) \
_tot = t = 0; \
do { \
_tot += _v[t] = (x); \
} while (++t < _nbt); \
if (_nbt == 1) { \
chunk_appendf(&trash, " %u\n", _tot); \
break; \