Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): reorder code in ParseModifierPart to b...



details:   https://anonhg.NetBSD.org/src/rev/a5b79470c75a
branches:  trunk
changeset: 936416:a5b79470c75a
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Jul 26 17:23:00 2020 +0000

description:
make(1): reorder code in ParseModifierPart to be more readable

diffstat:

 usr.bin/make/var.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 9e7a258784ec -r a5b79470c75a usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Jul 26 17:21:28 2020 +0000
+++ b/usr.bin/make/var.c        Sun Jul 26 17:23:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.320 2020/07/26 17:21:28 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.321 2020/07/26 17:23:00 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.320 2020/07/26 17:21:28 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.321 2020/07/26 17:23:00 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.320 2020/07/26 17:21:28 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.321 2020/07/26 17:23:00 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1829,10 +1829,10 @@
            cp++;
        } else if (*cp == '$') {
            if (cp[1] == delim) {       /* Unescaped $ at end of pattern */
-               if (out_pflags == NULL)
+               if (out_pflags != NULL)
+                   *out_pflags |= VARP_ANCHOR_END;
+               else
                    Buf_AddByte(&buf, *cp);
-               else
-                   *out_pflags |= VARP_ANCHOR_END;
            } else {
                if (!(eflags & VARE_NOSUBST)) {
                    char   *cp2;



Home | Main Index | Thread Index | Old Index