From 797262c9e92824a19005f56e85cd3f19b8273f9b Mon Sep 17 00:00:00 2001 From: will Date: Sat, 2 Dec 2000 18:58:01 +0000 Subject: There's no reason to use fancy forms of NULL. Replace all instances of NIL, NILLST, NILLGNODE, etc. with NULL. Obtained from: OpenBSD --- usr.bin/make/make.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'usr.bin/make/make.c') diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index 5829f60..6335b71 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -340,10 +340,10 @@ Make_HandleUse (cgn, pgn) } if (Lst_Open (cgn->children) == SUCCESS) { - while ((ln = Lst_Next (cgn->children)) != NILLNODE) { + while ((ln = Lst_Next (cgn->children)) != NULL) { gn = (GNode *)Lst_Datum (ln); - if (Lst_Member (pgn->children, gn) == NILLNODE) { + if (Lst_Member (pgn->children, gn) == NULL) { (void) Lst_AtEnd (pgn->children, gn); (void) Lst_AtEnd (gn->parents, pgn); pgn->unmade += 1; @@ -480,7 +480,7 @@ Make_Update (cgn) } if (Lst_Open (cgn->parents) == SUCCESS) { - while ((ln = Lst_Next (cgn->parents)) != NILLNODE) { + while ((ln = Lst_Next (cgn->parents)) != NULL) { pgn = (GNode *)Lst_Datum (ln); if (pgn->make) { pgn->unmade -= 1; @@ -514,11 +514,11 @@ Make_Update (cgn) * it means we need to place it in the queue as it restrained itself * before. */ - for (ln = Lst_First(cgn->successors); ln != NILLNODE; ln = Lst_Succ(ln)) { + for (ln = Lst_First(cgn->successors); ln != NULL; ln = Lst_Succ(ln)) { GNode *succ = (GNode *)Lst_Datum(ln); if (succ->make && succ->unmade == 0 && succ->made == UNMADE && - Lst_Member(toBeMade, (ClientData)succ) == NILLNODE) + Lst_Member(toBeMade, (ClientData)succ) == NULL) { (void)Lst_EnQueue(toBeMade, (ClientData)succ); } @@ -532,7 +532,7 @@ Make_Update (cgn) char *p1; char *cpref = Var_Value(PREFIX, cgn, &p1); - while ((ln = Lst_Next (cgn->iParents)) != NILLNODE) { + while ((ln = Lst_Next (cgn->iParents)) != NULL) { pgn = (GNode *)Lst_Datum (ln); if (pgn->make) { Var_Set (IMPSRC, cname, pgn); @@ -690,7 +690,7 @@ MakeStartJobs () if (!Lst_IsEmpty(gn->preds)) { LstNode ln; - for (ln = Lst_First(gn->preds); ln != NILLNODE; ln = Lst_Succ(ln)){ + for (ln = Lst_First(gn->preds); ln != NULL; ln = Lst_Succ(ln)){ GNode *pgn = (GNode *)Lst_Datum(ln); if (pgn->make && pgn->made == UNMADE) { @@ -701,12 +701,12 @@ MakeStartJobs () } } /* - * If ln isn't nil, there's a predecessor as yet unmade, so we + * If ln isn't NULL, there's a predecessor as yet unmade, so we * just drop this node on the floor. When the node in question * has been made, it will notice this node as being ready to * make but as yet unmade and will place the node on the queue. */ - if (ln != NILLNODE) { + if (ln != NULL) { continue; } } -- cgit v1.1