From e2922e42a00b3d247368a2c1f32740771aaae0cb Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 19 May 2006 12:48:56 +0000
Subject: [PATCH] - make it C89 compatible; Declarations in the middle of a
function is of course fine in C99, but it really serves no purpose other
than breaking compilation on C89 compilers. Thanks to Rich Felker for
pointing this out.
---
procps/top.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/procps/top.c b/procps/top.c
index 2dd171971..691b4ea7e 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -338,20 +338,21 @@ static void display_status(int count, int scr_width)
while (count--) {
div_t pmem = div( (s->rss*pmem_scale) >> pmem_shift, 10);
int col = scr_width+1;
+ USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(div_t pcpu;)
if (s->rss >= 100*1024)
sprintf(rss_str_buf, "%6ldM", s->rss/1024);
else
sprintf(rss_str_buf, "%7ld", s->rss);
- USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(div_t pcpu = div((s->pcpu*pcpu_scale) >> pcpu_shift, 10));
+ USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(pcpu = div((s->pcpu*pcpu_scale) >> pcpu_shift, 10);)
col -= printf("\n%5d %-8s %s %s%6d%3u.%c" \
- USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE("%3u.%c") " ",
+ USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE("%3u.%c") " ",
s->pid, s->user, s->state, rss_str_buf, s->ppid,
USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(pcpu.quot, '0'+pcpu.rem,)
pmem.quot, '0'+pmem.rem);
if (col>0)
printf("%.*s", col, s->short_cmd);
- /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
+ /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
jif.busy - prev_jif.busy, jif.total - prev_jif.total); */
s++;
}