diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-12-08 20:31:25 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-12-08 20:31:25 +0000 |
commit | f6bba3d68954624d8515b8345295710e60f78137 (patch) | |
tree | 1c123cb6ec3cba924c7bbc16436d98420448bb31 | |
parent | 9adcf73152e1cb4d537d3ff713abe9d1c51171dd (diff) | |
download | busybox-w32-f6bba3d68954624d8515b8345295710e60f78137.tar.gz busybox-w32-f6bba3d68954624d8515b8345295710e60f78137.tar.bz2 busybox-w32-f6bba3d68954624d8515b8345295710e60f78137.zip |
Splitting statements with #define's can cause trouble for cross
compilers (and it looks a bit messy)
-rw-r--r-- | procps/top.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/procps/top.c b/procps/top.c index 9944598c2..64b3c0732 100644 --- a/procps/top.c +++ b/procps/top.c | |||
@@ -409,17 +409,15 @@ static void display_status(int count, int col) | |||
409 | sprintf(rss_str_buf, "%6ldM", s->rss/1024); | 409 | sprintf(rss_str_buf, "%6ldM", s->rss/1024); |
410 | else | 410 | else |
411 | sprintf(rss_str_buf, "%7ld", s->rss); | 411 | sprintf(rss_str_buf, "%7ld", s->rss); |
412 | printf( | ||
413 | #ifdef FEATURE_CPU_USAGE_PERCENTAGE | 412 | #ifdef FEATURE_CPU_USAGE_PERCENTAGE |
414 | "%5d %-8s %s %s %5d %2d.%d %2u.%u ", | 413 | printf("%5d %-8s %s %s %5d %2d.%d %2u.%u ", |
414 | s->pid, s->user, s->state, rss_str_buf, s->ppid, | ||
415 | s->pcpu/10, s->pcpu%10, pmem/10, pmem%10); | ||
415 | #else | 416 | #else |
416 | "%5d %-8s %s %s %5d %2u.%u ", | 417 | printf("%5d %-8s %s %s %5d %2u.%u ", |
417 | #endif | ||
418 | s->pid, s->user, s->state, rss_str_buf, s->ppid, | 418 | s->pid, s->user, s->state, rss_str_buf, s->ppid, |
419 | #ifdef FEATURE_CPU_USAGE_PERCENTAGE | ||
420 | s->pcpu/10, s->pcpu%10, | ||
421 | #endif | ||
422 | pmem/10, pmem%10); | 419 | pmem/10, pmem%10); |
420 | #endif | ||
423 | if(strlen(namecmd) > col) | 421 | if(strlen(namecmd) > col) |
424 | namecmd[col] = 0; | 422 | namecmd[col] = 0; |
425 | printf("%s\n", namecmd); | 423 | printf("%s\n", namecmd); |