Module Name: src
Committed By: rillig
Date: Fri Jan 7 20:54:45 UTC 2022
Modified Files:
src/usr.bin/make: nonints.h parse.c suff.c
Log Message:
make: remove redundant function parameter in suffix handling
Now that mainNode is globally visible, there is no need to pass it
through function parameters.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.631 -r1.632 src/usr.bin/make/parse.c
cvs rdiff -u -r1.363 -r1.364 src/usr.bin/make/suff.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/nonints.h
diff -u src/usr.bin/make/nonints.h:1.232 src/usr.bin/make/nonints.h:1.233
--- src/usr.bin/make/nonints.h:1.232 Fri Jan 7 20:50:35 2022
+++ src/usr.bin/make/nonints.h Fri Jan 7 20:54:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.232 2022/01/07 20:50:35 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.233 2022/01/07 20:54:45 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -160,7 +160,7 @@ void Suff_ClearSuffixes(void);
bool Suff_IsTransform(const char *) MAKE_ATTR_USE;
GNode *Suff_AddTransform(const char *);
void Suff_EndTransform(GNode *);
-void Suff_AddSuffix(const char *, GNode **);
+void Suff_AddSuffix(const char *);
SearchPath *Suff_GetPath(const char *) MAKE_ATTR_USE;
void Suff_ExtendPaths(void);
void Suff_AddInclude(const char *);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.631 src/usr.bin/make/parse.c:1.632
--- src/usr.bin/make/parse.c:1.631 Fri Jan 7 20:50:35 2022
+++ src/usr.bin/make/parse.c Fri Jan 7 20:54:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.631 2022/01/07 20:50:35 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.632 2022/01/07 20:54:45 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,7 +106,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.631 2022/01/07 20:50:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.632 2022/01/07 20:54:45 rillig Exp $");
/*
* A file being read.
@@ -1160,7 +1160,7 @@ ParseDependencySourceSpecial(ParseSpecia
{
switch (special) {
case SP_SUFFIXES:
- Suff_AddSuffix(word, &mainNode);
+ Suff_AddSuffix(word);
break;
case SP_PATH:
AddToPaths(word, paths);
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.363 src/usr.bin/make/suff.c:1.364
--- src/usr.bin/make/suff.c:1.363 Fri Jan 7 20:50:35 2022
+++ src/usr.bin/make/suff.c Fri Jan 7 20:54:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.363 2022/01/07 20:50:35 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.364 2022/01/07 20:54:45 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.363 2022/01/07 20:50:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.364 2022/01/07 20:54:45 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -734,16 +734,15 @@ RebuildGraph(GNode *transform, Suffix *s
* true iff a new main target has been selected.
*/
static bool
-UpdateTarget(GNode *target, GNode **inout_main, Suffix *suff,
- bool *inout_removedMain)
+UpdateTarget(GNode *target, Suffix *suff, bool *inout_removedMain)
{
Suffix *srcSuff, *targSuff;
char *ptr;
- if (*inout_main == NULL && *inout_removedMain &&
+ if (mainNode == NULL && *inout_removedMain &&
GNode_IsMainCandidate(target)) {
DEBUG1(MAKE, "Setting main node to \"%s\"\n", target->name);
- *inout_main = target;
+ mainNode = target;
/*
* XXX: Why could it be a good idea to return true here?
* The main task of this function is to turn ordinary nodes
@@ -781,12 +780,12 @@ UpdateTarget(GNode *target, GNode **inou
return false;
if (ParseTransform(target->name, &srcSuff, &targSuff)) {
- if (*inout_main == target) {
+ if (mainNode == target) {
DEBUG1(MAKE,
"Setting main node from \"%s\" back to null\n",
target->name);
*inout_removedMain = true;
- *inout_main = NULL;
+ mainNode = NULL;
}
Lst_Done(&target->children);
Lst_Init(&target->children);
@@ -810,14 +809,14 @@ UpdateTarget(GNode *target, GNode **inou
* suffix rules.
*/
static void
-UpdateTargets(GNode **inout_main, Suffix *suff)
+UpdateTargets(Suffix *suff)
{
bool removedMain = false;
GNodeListNode *ln;
for (ln = Targ_List()->first; ln != NULL; ln = ln->next) {
GNode *gn = ln->datum;
- if (UpdateTarget(gn, inout_main, suff, &removedMain))
+ if (UpdateTarget(gn, suff, &removedMain))
break;
}
}
@@ -836,7 +835,7 @@ UpdateTargets(GNode **inout_main, Suffix
* name the name of the suffix to add
*/
void
-Suff_AddSuffix(const char *name, GNode **inout_main)
+Suff_AddSuffix(const char *name)
{
GNodeListNode *ln;
@@ -848,7 +847,7 @@ Suff_AddSuffix(const char *name, GNode *
Lst_Append(&sufflist, suff);
DEBUG1(SUFF, "Adding suffix \"%s\"\n", suff->name);
- UpdateTargets(inout_main, suff);
+ UpdateTargets(suff);
/*
* Look for any existing transformations from or to this suffix.
