[Pkg-sysvinit-commits] r219 - sysvinit/trunk/src

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-23 18:51:00 +0000 (Wed, 23 Nov 2005)
New Revision: 219

Modified:
   sysvinit/trunk/src/killall5.c
Log:
Reduce the number of strcmp()s called to the minimum required

Modified: sysvinit/trunk/src/killall5.c
===================================================================
--- sysvinit/trunk/src/killall5.c	2005-11-23 18:49:04 UTC (rev 218)
+++ sysvinit/trunk/src/killall5.c	2005-11-23 18:51:00 UTC (rev 219)
@@ -412,14 +412,16 @@
 		ok = 0;
 
 		/* Compare name (both basename and full path) */
-		ok += (p->argv0 && strcmp(p->argv0, prog) == 0);
-		ok += (p->argv0base && strcmp(p->argv0base, s) == 0);
+		ok |=
+			(p->argv0 && strcmp(p->argv0, prog) == 0)
+			|| (p->argv0base && strcmp(p->argv0base, s) == 0);
 
 		/* For scripts, compare argv[1] as well. */
 		if (scripts_too && p->argv1 &&
 		    !strncmp(p->statname, p->argv1base, STATNAMELEN)) {
-			ok += (strcmp(p->argv1, prog) == 0);
-			ok += (strcmp(p->argv1base, s) == 0);
+			ok |=
+				(strcmp(p->argv1, prog) == 0)
+				|| (strcmp(p->argv1base, s) == 0);
 		}
 
 		/*
@@ -430,7 +432,7 @@
 		    (p->argv0 == NULL ||
 		     p->argv0[0] == 0 ||
 		     strchr(p->argv0, ' '))) {
-			ok += (strcmp(p->statname, s) == 0);
+			ok |= (strcmp(p->statname, s) == 0);
 		}
 		if (ok) add_pid_to_q(q, p);
 	}