]> granicus.if.org Git - procps-ng/commitdiff
top: final cleanup following nls conflict resolutions
authorJim Warner <james.warner@comcast.net>
Tue, 20 Dec 2011 21:17:26 +0000 (15:17 -0600)
committerCraig Small <csmall@enc.com.au>
Thu, 22 Dec 2011 12:48:06 +0000 (23:48 +1100)
This patch represents the final resting place for miscellaneous
changes not otherwise encountered or for which the resolution
was incomplete or incorrect.

top/top.c

index e224dc25bab06e57ac658f00ea9b333a83879475..1d9ee5e4ac51e33b00dd4bceeed2de29d4c15d54 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -1412,7 +1412,7 @@ static void calibrate_fields (void) {
             f = w->pflgsall[i + w->begpflg];
             w->procflgs[i] = f;
 #ifndef USE_X_COLHDR
-            if (P_MAXPFLGS < f) continue;
+            if (P_MAXPFLGS <= f) continue;
 #endif
             h = Fieldstab[f].head;
             // 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);
             }
 #else
-            if (P_MAXPFLGS < f) continue;
+            if (P_MAXPFLGS <= f) continue;
 #endif
             h = Fieldstab[f].head;
             if (P_WCH == f) needpsdb = 1;