CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Thu Jul 23 19:32:54 UTC 2020

Modified Files:
        src/usr.bin/make: var.c

Log Message:
make(1): reduce code size on x86_64


To generate a diff of this commit:
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/make/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.295 src/usr.bin/make/var.c:1.296
--- src/usr.bin/make/var.c:1.295	Tue Jul 21 23:47:50 2020
+++ src/usr.bin/make/var.c	Thu Jul 23 19:32:54 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.295 2020/07/21 23:47:50 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.295 2020/07/21 23:47:50 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.295 2020/07/21 23:47:50 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1566,9 +1566,7 @@ VarSelectWords(Var_Parse_State *vpstate,
 	step = 1;
     }
 
-    for (i = start;
-	 (step < 0 && i >= end) || (step > 0 && i < end);
-	 i += step) {
+    for (i = start; (step < 0) == (i >= end); i += step) {
 	if (av[i][0] != '\0') {
 	    SepBuf_AddBytes(&buf, av[i], strlen(av[i]));
 	    SepBuf_Sep(&buf);