[src/trunk]: src/usr.bin/make make(1): improve parameter name in SuffUpdateTa...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51aa394565f7
branches:  trunk
changeset: 946231:51aa394565f7
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 21 18:09:13 2020 +0000

description:
make(1): improve parameter name in SuffUpdateTarget

diffstat:

 usr.bin/make/suff.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r f30837a58d02 -r 51aa394565f7 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Sat Nov 21 18:06:09 2020 +0000
+++ b/usr.bin/make/suff.c       Sat Nov 21 18:09:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.263 2020/11/21 18:06:09 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.264 2020/11/21 18:09:13 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.263 2020/11/21 18:06:09 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.264 2020/11/21 18:09:13 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -652,12 +652,14 @@
  *     TRUE iff a new main target has been selected.
  */
 static Boolean
-SuffUpdateTarget(GNode *target, GNode **inout_main, Suff *suff, Boolean *r)
+SuffUpdateTarget(GNode *target, GNode **inout_main, Suff *suff,
+                Boolean *inout_removedMain)
 {
     Suff *srcSuff, *targSuff;
     char *ptr;
 
-    if (*inout_main == NULL && *r && !(target->type & OP_NOTARGET)) {
+    if (*inout_main == NULL && *inout_removedMain &&
+       !(target->type & OP_NOTARGET)) {
        *inout_main = target;
        Targ_SetMain(target);
        return TRUE;
@@ -688,7 +690,7 @@
 
     if (SuffParseTransform(target->name, &srcSuff, &targSuff)) {
        if (*inout_main == target) {
-           *r = TRUE;
+           *inout_removedMain = TRUE;
            *inout_main = NULL;
            Targ_SetMain(NULL);
        }