From cf382f5bb1646fd96f9cb8c87b0638022d97f421 Mon Sep 17 00:00:00 2001
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 9 Oct 2002 01:51:00 +0000
Subject: [PATCH] Remove unused local-locals, where upper-level locals may
 safely be used.

---
 usr.bin/make/main.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 9e3895bcf833..1093f1dc21e9 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -799,7 +799,7 @@ main(argc, argv)
 	 * <directory>:<directory>:<directory>...
 	 */
 	if (Var_Exists("VPATH", VAR_CMD)) {
-		char *vpath, *path1, *cp1, savec;
+		char *vpath, savec;
 		/*
 		 * GCC stores string constants in read-only memory, but
 		 * Var_Subst will want to write this thing, so store it
@@ -808,18 +808,18 @@ main(argc, argv)
 		static char VPATH[] = "${VPATH}";
 
 		vpath = Var_Subst(NULL, VPATH, VAR_CMD, FALSE);
-		path1 = vpath;
+		path = vpath;
 		do {
 			/* skip to end of directory */
-			for (cp1 = path1; *cp1 != ':' && *cp1 != '\0'; cp1++)
+			for (cp = path; *cp != ':' && *cp != '\0'; cp++)
 				continue;
 			/* Save terminator character so know when to stop */
-			savec = *cp1;
-			*cp1 = '\0';
+			savec = *cp;
+			*cp = '\0';
 			/* Add directory to search path */
-			Dir_AddDir(dirSearchPath, path1);
-			*cp1 = savec;
-			path1 = cp1 + 1;
+			Dir_AddDir(dirSearchPath, path);
+			*cp = savec;
+			path = cp + 1;
 		} while (savec == ':');
 		(void)free(vpath);
 	}