diff options
| author | dsl <dsl@NetBSD.org> | 2006-10-27 21:00:18 +0000 |
|---|---|---|
| committer | dsl <dsl@NetBSD.org> | 2006-10-27 21:00:18 +0000 |
| commit | 16c8499ed2e7fdc9083aadbefbc787c02f07bcf4 (patch) | |
| tree | ca3bdc52bf79204e0e88a9cc42a7a64e6b514b30 /usr.bin/make/make.c | |
| parent | 3dc1c33272b933c1107a5e44de4f665dadee41bc (diff) | |
Since 'ClientData' is 'void *', nuke almost all the (ClientData) casts.
Diffstat (limited to 'usr.bin/make/make.c')
| -rw-r--r-- | usr.bin/make/make.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index 2e87981b077..c91ff2d6af0 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.66 2006/10/15 08:38:22 dsl Exp $ */ +/* $NetBSD: make.c,v 1.67 2006/10/27 21:00:19 dsl Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: make.c,v 1.66 2006/10/15 08:38:22 dsl Exp $"; +static char rcsid[] = "$NetBSD: make.c,v 1.67 2006/10/27 21:00:19 dsl Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: make.c,v 1.66 2006/10/15 08:38:22 dsl Exp $"); +__RCSID("$NetBSD: make.c,v 1.67 2006/10/27 21:00:19 dsl Exp $"); #endif #endif /* not lint */ #endif @@ -325,7 +325,7 @@ Make_OODate(GNode *gn) * thinking they're out-of-date. */ if (!oodate) { - Lst_ForEach(gn->parents, MakeTimeStamp, (ClientData)gn); + Lst_ForEach(gn->parents, MakeTimeStamp, gn); } return (oodate); @@ -355,7 +355,7 @@ MakeAddChild(ClientData gnp, ClientData lp) Lst l = (Lst) lp; if ((gn->flags & REMAKE) == 0 && !(gn->type & (OP_USE|OP_USEBEFORE))) { - (void)Lst_EnQueue(l, (ClientData)gn); + (void)Lst_EnQueue(l, gn); } return (0); } @@ -525,7 +525,7 @@ MakeHandleUse(ClientData cgnp, ClientData pgnp) * children the parent has. This is used by Make_Run to decide * whether to queue the parent or examine its children... */ - if ((ln = Lst_Member(pgn->children, (ClientData) cgn)) != NILLNODE) { + if ((ln = Lst_Member(pgn->children, cgn)) != NILLNODE) { Lst_Remove(pgn->children, ln); pgn->unmade--; } @@ -730,7 +730,7 @@ Make_Update(GNode *cgn) fprintf(debug_file, "# %s made, schedule %s\n", cgn->name, pgn->name); Targ_PrintNode(pgn, 0); } - (void)Lst_EnQueue(toBeMade, (ClientData)pgn); + (void)Lst_EnQueue(toBeMade, pgn); } else if (pgn->unmade < 0) { Error("Graph cycles through %s", pgn->name); } @@ -749,9 +749,9 @@ Make_Update(GNode *cgn) if ((succ->flags & REMAKE) != 0 && succ->unmade == 0 && succ->made == UNMADE && - Lst_Member(toBeMade, (ClientData)succ) == NILLNODE) + Lst_Member(toBeMade, succ) == NILLNODE) { - (void)Lst_EnQueue(toBeMade, (ClientData)succ); + (void)Lst_EnQueue(toBeMade, succ); } } @@ -897,8 +897,8 @@ MakeAddAllSrc(ClientData cgnp, ClientData pgnp) void Make_DoAllVar(GNode *gn) { - Lst_ForEach(gn->children, MakeUnmark, (ClientData) gn); - Lst_ForEach(gn->children, MakeAddAllSrc, (ClientData) gn); + Lst_ForEach(gn->children, MakeUnmark, gn); + Lst_ForEach(gn->children, MakeAddAllSrc, gn); if (!Var_Exists (OODATE, gn)) { Var_Set(OODATE, "", gn, 0); @@ -1055,11 +1055,11 @@ MakePrintStatus(ClientData gnp, ClientData cyclep) if (gn->made == CYCLE) { Error("Graph cycles through `%s'", gn->name); gn->made = ENDCYCLE; - Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t); + Lst_ForEach(gn->children, MakePrintStatus, &t); gn->made = UNMADE; } else if (gn->made != ENDCYCLE) { gn->made = CYCLE; - Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t); + Lst_ForEach(gn->children, MakePrintStatus, &t); } } else { printf("`%s' not remade because of errors.\n", gn->name); @@ -1140,23 +1140,23 @@ Make_ExpandUse(Lst targs) (void)Dir_MTime(gn); Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0); - Lst_ForEach(gn->children, MakeUnmark, (ClientData)gn); - Lst_ForEach(gn->children, MakeHandleUse, (ClientData)gn); + Lst_ForEach(gn->children, MakeUnmark, gn); + Lst_ForEach(gn->children, MakeHandleUse, gn); if ((gn->type & OP_MADE) == 0) Suff_FindDeps(gn); else { /* Pretend we made all this node's children */ - Lst_ForEach(gn->children, MakeFindChild, (ClientData)gn); + Lst_ForEach(gn->children, MakeFindChild, gn); if (gn->unmade != 0) printf("Warning: %s still has %d unmade children\n", gn->name, gn->unmade); } if (gn->unmade != 0) { - Lst_ForEach(gn->children, MakeAddChild, (ClientData)examine); + Lst_ForEach(gn->children, MakeAddChild, examine); } else { - (void)Lst_EnQueue(ntargs, (ClientData)gn); + (void)Lst_EnQueue(ntargs, gn); } } } @@ -1240,7 +1240,7 @@ Make_Run(Lst targs) * because some inferior reported an error. */ errors = ((errors == 0) && (numNodes != 0)); - Lst_ForEach(targs, MakePrintStatus, (ClientData) &errors); + Lst_ForEach(targs, MakePrintStatus, &errors); return (TRUE); } |
