diff options
author | dwmalone <dwmalone@FreeBSD.org> | 2002-01-24 17:58:42 +0000 |
---|---|---|
committer | dwmalone <dwmalone@FreeBSD.org> | 2002-01-24 17:58:42 +0000 |
commit | c48987263d3f55042a1e5d0c5e8411ed21161f2d (patch) | |
tree | 77ba8c0759d802c8505f8c156c2ba17717d80db5 /contrib/top/display.c | |
parent | 37a39754f41e50ca628e970dc78475098d1c10c5 (diff) | |
download | FreeBSD-src-c48987263d3f55042a1e5d0c5e8411ed21161f2d.zip FreeBSD-src-c48987263d3f55042a1e5d0c5e8411ed21161f2d.tar.gz |
Resolve conflicts.
Diffstat (limited to 'contrib/top/display.c')
-rw-r--r-- | contrib/top/display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/top/display.c b/contrib/top/display.c index 2a39072..22a940a 100644 --- a/contrib/top/display.c +++ b/contrib/top/display.c @@ -164,9 +164,9 @@ struct statics *statics; ip = cpustate_columns; while (*pp != NULL) { + *ip++ = cpustate_total_length; if ((i = strlen(*pp++)) > 0) { - *ip++ = cpustate_total_length; cpustate_total_length += i + 8; } } @@ -279,7 +279,7 @@ time_t *tod; } static int ltotal = 0; -static char procstates_buffer[128]; +static char procstates_buffer[MAX_COLS]; /* * *_procstates(total, brkdn, names) - print the process summary line @@ -321,7 +321,7 @@ int total; int *brkdn; { - static char new[128]; + static char new[MAX_COLS]; register int i; /* update number of processes only if it has changed */ @@ -467,7 +467,7 @@ register int *states; ((double)value)/10.); /* remember it for next time */ - *lp = *states; + *lp = value; } } |