diff options
| author | David Malone <dwmalone@FreeBSD.org> | 2002-01-24 17:58:42 +0000 |
|---|---|---|
| committer | David Malone <dwmalone@FreeBSD.org> | 2002-01-24 17:58:42 +0000 |
| commit | 337fd7a891fab9d73e904aa2a858b73aa3f5c3b0 (patch) | |
| tree | 77ba8c0759d802c8505f8c156c2ba17717d80db5 /contrib/top/display.c | |
| parent | db6a108dbf99fb9fd4cfbdd7d2308f574648c409 (diff) | |
| download | src-337fd7a891fab9d73e904aa2a858b73aa3f5c3b0.tar.gz src-337fd7a891fab9d73e904aa2a858b73aa3f5c3b0.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=89758
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 2a39072e2cb6..22a940a06973 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; } } |