CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Mon Dec  7 01:10:03 UTC 2020

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

Log Message:
make(1): merge local variables in Compat_Run


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/usr.bin/make/compat.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/compat.c
diff -u src/usr.bin/make/compat.c:1.201 src/usr.bin/make/compat.c:1.202
--- src/usr.bin/make/compat.c:1.201	Mon Dec  7 01:07:13 2020
+++ src/usr.bin/make/compat.c	Mon Dec  7 01:10:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.201 2020/12/07 01:07:13 rillig Exp $	*/
+/*	$NetBSD: compat.c,v 1.202 2020/12/07 01:10:03 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
 #include "pathnames.h"
 
 /*	"@(#)compat.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: compat.c,v 1.201 2020/12/07 01:07:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.202 2020/12/07 01:10:03 rillig Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -664,8 +664,7 @@ void
 Compat_Run(GNodeList *targs)
 {
 	GNode *gn = NULL;	/* Current root target */
-	Boolean mainError;
-	Boolean endError;
+	Boolean seenError;
 
 	if (!shellName)
 		Shell_Init();
@@ -705,7 +704,7 @@ Compat_Run(GNodeList *targs)
 	 */
 	Make_ExpandUse(targs);
 
-	mainError = FALSE;
+	seenError = FALSE;
 	while (!Lst_IsEmpty(targs)) {
 		gn = Lst_Dequeue(targs);
 		Compat_Make(gn, gn);
@@ -715,7 +714,7 @@ Compat_Run(GNodeList *targs)
 		} else if (gn->made == ABORTED) {
 			printf("`%s' not remade because of errors.\n",
 			       gn->name);
-			mainError = TRUE;
+			seenError = TRUE;
 		}
 	}
 
@@ -724,19 +723,18 @@ Compat_Run(GNodeList *targs)
 	 * the last one succeeds?  This should not count as overall success.
 	 */
 	if (GNode_IsError(gn))
-		mainError = TRUE;
+		seenError = TRUE;
 
 	/*
 	 * If the user has defined a .END target, run its commands.
 	 */
-	if (!mainError) {
+	if (!seenError) {
 		GNode *endNode = Targ_GetEndNode();
 		Compat_Make(endNode, endNode);
-		endError = GNode_IsError(endNode);
-	} else
-		endError = FALSE;
+		seenError = GNode_IsError(endNode);
+	}
 
-	if (mainError || endError) {
+	if (seenError) {
 		PrintOnError(gn, "\nStop.");
 		exit(1);
 	}