emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make it C89 compatible; Declarations in the middle of a function is of course

Browse Source 
fine in C99, but it really serves no purpose other than breaking compilation
  on C89 compilers.
  Thanks to Rich Felker for pointing this out.
This commit is contained in:
Bernhard Reutner-Fischer
2006-05-19 12:48:56 +00:00
parent 38583fd6f2
commit e2922e42a0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
procps/top.c
View File

@ -338,20 +338,21 @@ static void display_status(int count, int scr_width)
while (count--) { while (count--) {
div_t pmem = div( (s->rss*pmem_scale) >> pmem_shift, 10); div_t pmem = div( (s->rss*pmem_scale) >> pmem_shift, 10);
int col = scr_width+1; int col = scr_width+1;
USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(div_t pcpu;)
if (s->rss >= 100*1024) if (s->rss >= 100*1024)
sprintf(rss_str_buf, "%6ldM", s->rss/1024); sprintf(rss_str_buf, "%6ldM", s->rss/1024);
else else
sprintf(rss_str_buf, "%7ld", s->rss); 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" \ 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, s->pid, s->user, s->state, rss_str_buf, s->ppid,
USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(pcpu.quot, '0'+pcpu.rem,) USE_FEATURE_TOP_CPU_USAGE_PERCENTAGE(pcpu.quot, '0'+pcpu.rem,)
pmem.quot, '0'+pmem.rem); pmem.quot, '0'+pmem.rem);
if (col>0) if (col>0)
printf("%.*s", col, s->short_cmd); 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); */ jif.busy - prev_jif.busy, jif.total - prev_jif.total); */
s++; s++;
} }