Module Name: src
Committed By: rillig
Date: Sat Sep 12 15:21:25 UTC 2020
Modified Files:
src/usr.bin/make: nonints.h parse.c suff.c
Log Message:
make(1): fix prototype of Suff_EndTransform
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.292 -r1.293 src/usr.bin/make/parse.c
cvs rdiff -u -r1.149 -r1.150 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.110 src/usr.bin/make/nonints.h:1.111
--- src/usr.bin/make/nonints.h:1.110 Sat Sep 12 15:15:51 2020
+++ src/usr.bin/make/nonints.h Sat Sep 12 15:21:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.110 2020/09/12 15:15:51 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.111 2020/09/12 15:21:25 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -156,7 +156,7 @@ Boolean Str_Match(const char *, const ch
void Suff_ClearSuffixes(void);
Boolean Suff_IsTransform(char *);
GNode *Suff_AddTransform(char *);
-int Suff_EndTransform(void *, void *);
+void Suff_EndTransform(GNode *);
void Suff_AddSuffix(const char *, GNode **);
Lst Suff_GetPath(char *);
void Suff_DoPaths(void);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.292 src/usr.bin/make/parse.c:1.293
--- src/usr.bin/make/parse.c:1.292 Sat Sep 12 14:41:00 2020
+++ src/usr.bin/make/parse.c Sat Sep 12 15:21:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.292 2020/09/12 14:41:00 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.293 2020/09/12 15:21:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.292 2020/09/12 14:41:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.293 2020/09/12 15:21:25 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.292 2020/09/12 14:41:00 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.293 2020/09/12 15:21:25 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -2842,6 +2842,13 @@ ParseReadLine(void)
}
}
+static int
+SuffEndTransform(void *target, void *unused MAKE_ATTR_UNUSED)
+{
+ Suff_EndTransform(target);
+ return 0;
+}
+
/*-
*-----------------------------------------------------------------------
* ParseFinishLine --
@@ -2860,7 +2867,7 @@ ParseFinishLine(void)
{
if (inLine) {
if (targets != NULL) {
- Lst_ForEach(targets, Suff_EndTransform, NULL);
+ Lst_ForEach(targets, SuffEndTransform, NULL);
Lst_Destroy(targets, ParseHasCommands);
}
targets = NULL;
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.149 src/usr.bin/make/suff.c:1.150
--- src/usr.bin/make/suff.c:1.149 Sat Sep 12 15:15:51 2020
+++ src/usr.bin/make/suff.c Sat Sep 12 15:21:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.149 2020/09/12 15:15:51 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.150 2020/09/12 15:21:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.149 2020/09/12 15:15:51 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.150 2020/09/12 15:21:25 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.149 2020/09/12 15:15:51 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.150 2020/09/12 15:21:25 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -616,16 +616,11 @@ Suff_AddTransform(char *line)
* of the affected suffixes are altered.
*
* Input:
- * gnp Node for transformation
- *
- * Results:
- * 0, so that Lst_ForEach continues
+ * gn Node for transformation
*/
-int
-Suff_EndTransform(void *gnp, void *dummy MAKE_ATTR_UNUSED)
+void
+Suff_EndTransform(GNode *gn)
{
- GNode *gn = (GNode *)gnp;
-
if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(gn->cohorts))
gn = LstNode_Datum(Lst_Last(gn->cohorts));
if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) &&
@@ -666,8 +661,6 @@ Suff_EndTransform(void *gnp, void *dummy
} else if (gn->type & OP_TRANSFORM) {
SUFF_DEBUG1("transformation %s complete\n", gn->name);
}
-
- return 0;
}
/* Called from Suff_AddSuffix via Lst_ForEach to search through the list of
