From f177718f24c050c458f9ec8f944a8f2cea92b372 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 28 Apr 2016 16:11:30 +0200 Subject: format: Add missing braces around 'if' clause MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When compiling bmon with gcc 6.1 it complains with the following warning: out_format.c: In function ‘get_token’: out_format.c:134:10: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] } else if (!strncasecmp(token+5, "txrate:", 7)) ^~ out_format.c:136:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’ return buf; ^~~~~~ Indeed, the 'return buf' should only be executed if it was snprintf()'ed to. Otherwise "unknown" should be returned. Fix this by adding braces. Also use the 'type' variable in strncasecmp() as in the other checks. Signed-off-by: Tobias Klauser --- src/out_format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/out_format.c b/src/out_format.c index d9d5e36..aea38c5 100644 --- a/src/out_format.c +++ b/src/out_format.c @@ -131,9 +131,10 @@ static char *get_token(struct element_group *g, struct element *e, } else if (!strncasecmp(type, "rxrate:", 7)) { snprintf(buf, len, "%.2f", a->a_rx_rate.r_rate); return buf; - } else if (!strncasecmp(token+5, "txrate:", 7)) + } else if (!strncasecmp(type, "txrate:", 7)) { snprintf(buf, len, "%.2f", a->a_tx_rate.r_rate); return buf; + } } fprintf(stderr, "Unknown field \"%s\"\n", token); -- cgit v1.2.3