[src/trunk]: src/usr.bin/make make(1): make implementation of the :C modifier...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2edc4918ea79
branches:  trunk
changeset: 936226:2edc4918ea79
user:      rillig <rillig%NetBSD.org@localhost>
date:      Tue Jul 21 23:22:45 2020 +0000

description:
make(1): make implementation of the :C modifier simpler

diffstat:

 usr.bin/make/var.c |  22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diffs (61 lines):

diff -r 28bc189cb5ed -r 2edc4918ea79 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Tue Jul 21 23:19:46 2020 +0000
+++ b/usr.bin/make/var.c        Tue Jul 21 23:22:45 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.293 2020/07/21 21:32:55 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.294 2020/07/21 23:22:45 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.293 2020/07/21 21:32:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.294 2020/07/21 23:22:45 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.293 2020/07/21 21:32:55 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.294 2020/07/21 23:22:45 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1435,8 +1435,6 @@
            } else if (*rp == '&' ||
                (*rp == '\\' && isdigit((unsigned char)rp[1]))) {
                int n;
-               const char *subbuf;
-               int sublen;
                char errstr[3];
 
                if (*rp == '&') {
@@ -1452,20 +1450,16 @@
                }
 
                if (n >= pat->nsub) {
-                   Error("No subexpression %s", &errstr[0]);
-                   subbuf = "";
-                   sublen = 0;
+                   Error("No subexpression %s", errstr);
                } else if ((pat->matches[n].rm_so == -1) &&
                           (pat->matches[n].rm_eo == -1)) {
-                   Error("No match for subexpression %s", &errstr[0]);
-                   subbuf = "";
-                   sublen = 0;
+                   Error("No match for subexpression %s", errstr);
                } else {
-                   subbuf = wp + pat->matches[n].rm_so;
-                   sublen = pat->matches[n].rm_eo - pat->matches[n].rm_so;
+                   const char *subbuf = wp + pat->matches[n].rm_so;
+                   int sublen = pat->matches[n].rm_eo - pat->matches[n].rm_so;
+                   SepBuf_AddBytes(buf, subbuf, sublen);
                }
 
-               SepBuf_AddBytes(buf, subbuf, sublen);
            } else {
                SepBuf_AddBytes(buf, rp, 1);
            }