CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Jul 26 17:09:23 UTC 2020

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

Log Message:
make(1): save a few bytes and cycles by comparing against 0

The comparison against ac - 1 could have been optimized by the compilers
as well, but both GCC 5 and Clang produce smaller code for the comparison
against 0.


To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 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.317 src/usr.bin/make/var.c:1.318
--- src/usr.bin/make/var.c:1.317	Sun Jul 26 16:59:08 2020
+++ src/usr.bin/make/var.c	Sun Jul 26 17:09:23 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.317 2020/07/26 16:59:08 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.318 2020/07/26 17:09:23 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.317 2020/07/26 16:59:08 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.318 2020/07/26 17:09:23 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.317 2020/07/26 16:59:08 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.318 2020/07/26 17:09:23 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1699,9 +1699,9 @@ VarOrder(const char *str, const char oty
     }
 
     for (i = 0; i < ac; i++) {
-	Buf_AddStr(&buf, av[i]);
-	if (i != ac - 1)
+	if (i != 0)
 	    Buf_AddByte(&buf, ' ');
+	Buf_AddStr(&buf, av[i]);
     }
 
     free(as);
@@ -1746,9 +1746,9 @@ VarUniq(const char *str)
     }
 
     for (i = 0; i < ac; i++) {
-	Buf_AddStr(&buf, av[i]);
-	if (i != ac - 1)
+	if (i != 0)
 	    Buf_AddByte(&buf, ' ');
+	Buf_AddStr(&buf, av[i]);
     }
 
     free(as);
@@ -1787,9 +1787,9 @@ VarRange(const char *str, int ac)
 	av = brk_string(str, &ac, FALSE, &as);
     }
     for (i = 0; i < ac; i++) {
-	Buf_AddInt(&buf, 1 + i);
-	if (i != ac - 1)
+	if (i != 0)
 	    Buf_AddByte(&buf, ' ');
+	Buf_AddInt(&buf, 1 + i);
     }
 
     free(as);