CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sat Oct  3 12:46:52 UTC 2020

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

Log Message:
make(1): extract ApplyModifier_Unique into separate function


To generate a diff of this commit:
cvs rdiff -u -r1.560 -r1.561 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.560 src/usr.bin/make/var.c:1.561
--- src/usr.bin/make/var.c:1.560	Sat Oct  3 12:30:17 2020
+++ src/usr.bin/make/var.c	Sat Oct  3 12:46:52 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.560 2020/10/03 12:30:17 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.561 2020/10/03 12:46:52 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -121,7 +121,7 @@
 #include    "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.560 2020/10/03 12:30:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.561 2020/10/03 12:46:52 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -2927,6 +2927,17 @@ ApplyModifier_WordFunc(const char **pp, 
     return AMR_OK;
 }
 
+static ApplyModifierResult
+ApplyModifier_Unique(const char **pp, ApplyModifiersState *st)
+{
+    if ((*pp)[1] == st->endc || (*pp)[1] == ':') {
+	st->newVal = VarUniq(st->val);
+	(*pp)++;
+	return AMR_OK;
+    } else
+	return AMR_UNKNOWN;
+}
+
 #ifdef SYSVVARSUB
 /* :from=to */
 static ApplyModifierResult
@@ -3110,12 +3121,7 @@ ApplyModifier(const char **pp, ApplyModi
     case 'O':
 	return ApplyModifier_Order(pp, st);
     case 'u':
-	if ((*pp)[1] == st->endc || (*pp)[1] == ':') {
-	    st->newVal = VarUniq(st->val);
-	    (*pp)++;
-	    return AMR_OK;
-	} else
-	    return AMR_UNKNOWN;
+        return ApplyModifier_Unique(pp, st);
 #ifdef SUNSHCMD
     case 's':
 	return ApplyModifier_SunShell(pp, st);