Module Name: othersrc
Committed By: dholland
Date: Sat Mar 23 18:35:32 UTC 2013
Modified Files:
othersrc/usr.bin/dholland-make2: nonints.h parse.c suff.c
Log Message:
Use real types.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/dholland-make2/nonints.h
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/dholland-make2/parse.c
cvs rdiff -u -r1.18 -r1.19 othersrc/usr.bin/dholland-make2/suff.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/dholland-make2/nonints.h
diff -u othersrc/usr.bin/dholland-make2/nonints.h:1.7 othersrc/usr.bin/dholland-make2/nonints.h:1.8
--- othersrc/usr.bin/dholland-make2/nonints.h:1.7 Sat Mar 23 18:33:00 2013
+++ othersrc/usr.bin/dholland-make2/nonints.h Sat Mar 23 18:35:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.7 2013/03/23 18:33:00 dholland Exp $ */
+/* $NetBSD: nonints.h,v 1.8 2013/03/23 18:35:31 dholland Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -144,7 +144,7 @@ void Str_SYSVSubst(Buffer *, char *, cha
void Suff_ClearSuffixes(void);
Boolean Suff_IsTransform(const char *);
GNode *Suff_AddTransform(const char *);
-int Suff_EndTransform(void *, void *);
+void Suff_EndTransform(GNode *);
void Suff_AddSuffix(const char *, GNode **);
struct patharray *Suff_GetPath(const char *);
void Suff_DoPaths(void);
Index: othersrc/usr.bin/dholland-make2/parse.c
diff -u othersrc/usr.bin/dholland-make2/parse.c:1.8 othersrc/usr.bin/dholland-make2/parse.c:1.9
--- othersrc/usr.bin/dholland-make2/parse.c:1.8 Sat Mar 23 18:33:00 2013
+++ othersrc/usr.bin/dholland-make2/parse.c Sat Mar 23 18:35:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.8 2013/03/23 18:33:00 dholland Exp $ */
+/* $NetBSD: parse.c,v 1.9 2013/03/23 18:35:31 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -138,7 +138,7 @@
#include "buf.h"
#include "pathnames.h"
-MAKE_RCSID("$NetBSD: parse.c,v 1.8 2013/03/23 18:33:00 dholland Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.9 2013/03/23 18:35:31 dholland Exp $");
////////////////////////////////////////////////////////////
// types and constants
@@ -2731,9 +2731,7 @@ ParseFinishLine(void)
if (inLine) {
for (i=0; i<glist_num(&targets); i++) {
- if (Suff_EndTransform(glist_get(&targets, i), NULL)) {
- break;
- }
+ Suff_EndTransform(glist_get(&targets, i));
}
for (i=0; i<glist_num(&targets); i++) {
ParseHasCommands(glist_get(&targets, i));
Index: othersrc/usr.bin/dholland-make2/suff.c
diff -u othersrc/usr.bin/dholland-make2/suff.c:1.18 othersrc/usr.bin/dholland-make2/suff.c:1.19
--- othersrc/usr.bin/dholland-make2/suff.c:1.18 Sat Mar 23 18:33:00 2013
+++ othersrc/usr.bin/dholland-make2/suff.c Sat Mar 23 18:35:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.18 2013/03/23 18:33:00 dholland Exp $ */
+/* $NetBSD: suff.c,v 1.19 2013/03/23 18:35:31 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "hash.h"
#include "dir.h"
-MAKE_RCSID("$NetBSD: suff.c,v 1.18 2013/03/23 18:33:00 dholland Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.19 2013/03/23 18:35:31 dholland Exp $");
#define CLEANUP
@@ -646,11 +646,9 @@ Suff_AddTransform(const char *line)
*
*-----------------------------------------------------------------------
*/
-int
-Suff_EndTransform(void *gnp, void *dummy)
+void
+Suff_EndTransform(GNode *gn)
{
- GNode *gn = (GNode *)gnp;
-
if ((gn->type & OP_DOUBLEDEP) && glist_num(&gn->cohorts) > 0) {
gn = glist_get(&gn->cohorts, glist_num(&gn->cohorts) - 1);
}
@@ -694,8 +692,6 @@ Suff_EndTransform(void *gnp, void *dummy
} else if ((gn->type & OP_TRANSFORM) && DEBUG(SUFF)) {
fprintf(debug_file, "transformation %s complete\n", gn->name);
}
-
- return(dummy ? 0 : 0);
}
/*-
