Mon Aug 31 19:09:19 2020 UTC ()

make(1): inline a local variable in VarUniq

Just to eliminate any remote possibility of aliasing and thereby
forgetting to update all involved variables.


(rillig)

diff -r1.481 -r1.482 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/08/31 19:05:53	1.481
+++ src/usr.bin/make/var.c 2020/08/31 19:09:19	1.482

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.481 2020/08/31 19:05:53 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.482 2020/08/31 19:09:19 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.481 2020/08/31 19:05:53 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.482 2020/08/31 19:09:19 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.481 2020/08/31 19:05:53 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.482 2020/08/31 19:09:19 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist.
+ *
 @@ -1599,33 +1599,32 @@ Words_JoinFree(Words words)
 	Buf_AddStr(&buf, words.words[i]);
+    }
     Words_Free(words);
     return Buf_Destroy(&buf, FALSE);
+}
 /* Remove adjacent duplicate words. */
 static char *
 VarUniq(const char *str)
+{
     Words words = Str_Words(str, FALSE);
     char **av = words.words;
     if (words.len > 1) {
 	size_t i, j;
 	for (j = 0, i = 1; i < words.len; i++)
-	    if (strcmp(av[i], av[j]) != 0 && (++j != i))
+	    if (strcmp(words.words[i], words.words[j]) != 0 && (++j != i))
-		av[j] = av[i];
+		words.words[j] = words.words[i];
 	words.len = j + 1;
+    }
     return Words_JoinFree(words);
+}
 /*-
  * Parse a part of a modifier such as the "from" and "to" in :S/from/to/
  * or the "var" or "replacement" in :@var@replacement+${var}@, up to and
  * including the next unescaped delimiter.  The delimiter, as well as the
  * backslash or the dollar, can be escaped with a backslash.
+ *