aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-11-18 16:57:47 +0100
committerStephen Hemminger <shemming@brocade.com>2015-11-23 15:54:05 -0800
commitfdb347f7fd6c36b270a8c571cbe9a124a281b2b5 (patch)
tree85c21fbdb785b5daf621bb85cb3b4f44dcda64e9
parent869fcabecc3f544c1ba17c8c2ee5a9c9296126dd (diff)
downloadandroid_external_iproute2-fdb347f7fd6c36b270a8c571cbe9a124a281b2b5.tar.gz
android_external_iproute2-fdb347f7fd6c36b270a8c571cbe9a124a281b2b5.tar.bz2
android_external_iproute2-fdb347f7fd6c36b270a8c571cbe9a124a281b2b5.zip
lnstat: fix header displaying mechanism
The algorithm depends on the loop counter ('i') to increment by one in each iteration. Though if running endlessly (count==0), the counter was not incremented at all. Also change formatting of the header printing conditional a bit so it's hopefully easier to read. Fixes: e7e2913 ("lnstat: run indefinitely by default") Signed-off-by: Phil Sutter <phil@nwl.cc>
-rw-r--r--misc/lnstat.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/misc/lnstat.c b/misc/lnstat.c
index 529bc33..264c953 100644
--- a/misc/lnstat.c
+++ b/misc/lnstat.c
@@ -359,21 +359,19 @@ int main(int argc, char **argv)
if (interval < 1 )
interval = 1;
- for (i = 0; i < count || !count; ) {
+ for (i = 0; i < count || !count; i++) {
lnstat_update(lnstat_files);
if (mode == MODE_JSON)
print_json(stdout, lnstat_files, &fp);
else {
- if ((hdr > 1 &&
- (! (i % 20))) || (hdr == 1 && i == 0))
+ if ((hdr > 1 && !(i % 20)) ||
+ (hdr == 1 && i == 0))
print_hdr(stdout, header);
print_line(stdout, lnstat_files, &fp);
}
fflush(stdout);
if (i < count - 1 || !count)
sleep(interval);
- if (count)
- ++i;
}
break;
}