Sat Oct 3 12:46:52 2020 UTC ()

make(1): extract ApplyModifier_Unique into separate function


(rillig)

diff -r1.560 -r1.561 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/10/03 12:30:17	1.560
+++ src/usr.bin/make/var.c 2020/10/03 12:46:52	1.561

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -111,27 +111,27 @@
 #include    <sys/types.h>
 #include    <regex.h>
 #endif
 #include    <inttypes.h>
 #include    <limits.h>
 #include    <time.h>
 #include    "make.h"
 #include    "dir.h"
 #include    "job.h"
 #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)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 @@ -2917,26 +2917,37 @@ static ApplyModifierResult
 ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st,
 		       ModifyWordsCallback modifyWord)
+{
     char delim = (*pp)[1];
     if (delim != st->endc && delim != ':')
 	return AMR_UNKNOWN;
     st->newVal = ModifyWords(st->ctxt, st->sep, st->oneBigWord,
 			     st->val, modifyWord, NULL);
     (*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
 ApplyModifier_SysV(const char **pp, ApplyModifiersState *st)
+{
     char *lhs, *rhs;
     VarParseResult res;
     const char *mod = *pp;
     Boolean eqFound = FALSE;
     /*
      * First we make a pass through the string trying
 @@ -3100,32 +3111,27 @@ ApplyModifier(const char **pp, ApplyModi
     case 'T':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail);
     case 'H':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Head);
     case 'E':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix);
     case 'R':
 	return ApplyModifier_WordFunc(pp, st, ModifyWord_Root);
     case 'r':
 	return ApplyModifier_Range(pp, st);
     case 'O':
 	return ApplyModifier_Order(pp, st);
     case 'u':
-	if ((*pp)[1] == st->endc || (*pp)[1] == ':') {
+        return ApplyModifier_Unique(pp, st);
 	    st->newVal = VarUniq(st->val);
 	    (*pp)++;
 	    return AMR_OK;
 	} else
 	    return AMR_UNKNOWN;
 #ifdef SUNSHCMD
     case 's':
 	return ApplyModifier_SunShell(pp, st);
 #endif
     default:
 	return AMR_UNKNOWN;
+    }
+}
 /* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */
 static char *
 ApplyModifiers(
     const char **pp,		/* the parsing position, updated upon return */