emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: final cleanup following nls conflict resolutions

Browse Source 
This patch represents the final resting place for miscellaneous
changes not otherwise encountered or for which the resolution
was incomplete or incorrect.
This commit is contained in:
Jim Warner 2011-12-20 15:17:26 -06:00 committed by Craig Small
parent c465dca573
commit f38c42ff21
1 changed files with 2 additions and 2 deletions

4
top/top.c

@ -1412,7 +1412,7 @@ static void calibrate_fields (void) {
f = w->pflgsall[i + w->begpflg]; f = w->pflgsall[i + w->begpflg];
w->procflgs[i] = f; w->procflgs[i] = f;
#ifndef USE_X_COLHDR #ifndef USE_X_COLHDR
if (P_MAXPFLGS < f) continue; if (P_MAXPFLGS <= f) continue;
#endif #endif
h = Fieldstab[f].head; h = Fieldstab[f].head;
// oops, won't fit -- we're outta here... // oops, won't fit -- we're outta here...
@ -1463,7 +1463,7 @@ static void calibrate_fields (void) {
w->hdrcaplen += strlen(Caps_off) + strlen(w->capclr_msg); w->hdrcaplen += strlen(Caps_off) + strlen(w->capclr_msg);
} }
#else #else
if (P_MAXPFLGS < f) continue; if (P_MAXPFLGS <= f) continue;
#endif #endif
h = Fieldstab[f].head; h = Fieldstab[f].head;
if (P_WCH == f) needpsdb = 1; if (P_WCH == f) needpsdb = 1;