CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Fri Jul 24 08:22:05 UTC 2020

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

Log Message:
make(1): prefer direct jump over indirect variable assignment


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 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.306 src/usr.bin/make/var.c:1.307
--- src/usr.bin/make/var.c:1.306	Fri Jul 24 08:20:24 2020
+++ src/usr.bin/make/var.c	Fri Jul 24 08:22:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.306 2020/07/24 08:20:24 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.307 2020/07/24 08:22:05 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.306 2020/07/24 08:20:24 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.307 2020/07/24 08:22:05 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.306 2020/07/24 08:20:24 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.307 2020/07/24 08:22:05 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1393,11 +1393,10 @@ ModifyWord_SubstRegex(const char *word, 
     regmatch_t m[10];
 
     if ((args->pflags & VARP_SUB_ONE) && (args->pflags & VARP_SUB_MATCHED))
-	xrv = REG_NOMATCH;
-    else {
-    tryagain:
-	xrv = regexec(&args->re, wp, args->nsub, m, flags);
-    }
+	goto nosub;
+
+tryagain:
+    xrv = regexec(&args->re, wp, args->nsub, m, flags);
 
     switch (xrv) {
     case 0:
@@ -1456,6 +1455,7 @@ ModifyWord_SubstRegex(const char *word, 
 	VarREError(xrv, &args->re, "Unexpected regex error");
 	/* fall through */
     case REG_NOMATCH:
+    nosub:
 	SepBuf_AddBytes(buf, wp, strlen(wp));
 	break;
     }