]> granicus.if.org Git - procps-ng/commitdiff
top: make rcfile duplicate fields check more efficient
authorJim Warner <james.warner@comcast.net>
Tue, 12 Jun 2018 05:00:00 +0000 (00:00 -0500)
committerCraig Small <csmall@enc.com.au>
Sat, 23 Jun 2018 12:03:56 +0000 (22:03 +1000)
Jeeze, there was no need to employ *both* strchr() and
strrchr() when ensuring fields hadn't been duplicated.

So let's avoid one of those function calls completely.

Signed-off-by: Jim Warner <james.warner@comcast.net>
top/top.c

index f4898de93e71187587bcc8e5be13ddf1ba3851ce..3681758f3e9eff7f4585a26aee4411155e300504 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -3742,7 +3742,7 @@ static const char *config_file (FILE *fp, const char *name, float *delay) {
 #endif
       // ensure there's been no manual alteration of fieldscur
       for (n = 0 ; n < EU_MAXPFLGS; n++) {
-         if (strchr(w->rc.fieldscur, w->rc.fieldscur[n]) != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
+         if (&w->rc.fieldscur[n] != strrchr(w->rc.fieldscur, w->rc.fieldscur[n]))
             return p;
       }
       // be tolerant of missing release 3.3.10 graph modes additions