diff options
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index d094b4d07de..4cb4c53ba5c 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.32 1999/12/18 02:11:27 espie Exp $ */ +/* $OpenBSD: parse.c,v 1.33 1999/12/18 21:53:32 espie Exp $ */ /* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */ /* @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.32 1999/12/18 02:11:27 espie Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.33 1999/12/18 21:53:32 espie Exp $"; #endif #endif /* not lint */ @@ -187,7 +187,7 @@ static ParseSpecial specType; static int waiting; /* - * Predecessor node for handling .ORDER. Initialized to NILGNODE when .ORDER + * Predecessor node for handling .ORDER. Initialized to NULL when .ORDER * seen, then set to each successive source on the line. */ static GNode *predecessor; @@ -434,7 +434,7 @@ ParseLinkSrc (pgnp, cgnp) { GNode *pgn = (GNode *) pgnp; GNode *cgn = (GNode *) cgnp; - if (Lst_Member (pgn->children, (ClientData)cgn) == NILLNODE) { + if (Lst_Member (pgn->children, (ClientData)cgn) == NULL) { (void)Lst_AtEnd (pgn->children, (ClientData)cgn); if (specType == Not) { (void)Lst_AtEnd (cgn->parents, (ClientData)pgn); @@ -626,7 +626,7 @@ ParseDoSrc (tOp, src, allsrc) * source and the current one. */ gn = Targ_FindNode(src, TARG_CREATE); - if (predecessor != NILGNODE) { + if (predecessor != NULL) { (void)Lst_AtEnd(predecessor->successors, (ClientData)gn); (void)Lst_AtEnd(gn->preds, (ClientData)predecessor); } @@ -658,7 +658,7 @@ ParseDoSrc (tOp, src, allsrc) register GNode *cohort; register LstNode ln; - for (ln=Lst_First(gn->cohorts); ln != NILLNODE; ln = Lst_Succ(ln)){ + for (ln=Lst_First(gn->cohorts); ln != NULL; ln = Lst_Succ(ln)){ cohort = (GNode *)Lst_Datum(ln); if (tOp) { cohort->type |= tOp; @@ -937,7 +937,7 @@ ParseDoDependency (line) * main target. * .NOTPARALLEL Make only one target at a time. * .SINGLESHELL Create a shell for each command. - * .ORDER Must set initial predecessor to NIL + * .ORDER Must set initial predecessor to NULL */ switch (specType) { case ExPath: @@ -975,7 +975,7 @@ ParseDoDependency (line) compatMake = 1; break; case Order: - predecessor = NILGNODE; + predecessor = NULL; break; default: break; @@ -990,13 +990,13 @@ ParseDoDependency (line) specType = ExPath; path = Suff_GetPath (&line[5]); - if (path == NILLST) { + if (path == NULL) { Parse_Error (PARSE_FATAL, "Suffix '%s' not defined (yet)", &line[5]); return; } else { - if (paths == (Lst)NULL) { + if (paths == NULL) { paths = Lst_Init(); } (void)Lst_AtEnd(paths, (ClientData)path); @@ -1294,7 +1294,7 @@ ParseDoDependency (line) } } - if (mainNode == NILGNODE) { + if (mainNode == NULL) { /* * If we have yet to decide on a main target to make, in the * absence of any user input, we want the first target on @@ -2640,7 +2640,7 @@ Parse_File(name, stream) void Parse_Init () { - mainNode = NILGNODE; + mainNode = NULL; parseIncPath = Lst_Init(); sysIncPath = Lst_Init(); includes = Lst_Init(); @@ -2684,7 +2684,7 @@ Parse_MainName() listmain = Lst_Init(); - if (mainNode == NILGNODE) { + if (mainNode == NULL) { Punt ("no target to make."); /*NOTREACHED*/ } else if (mainNode->type & OP_DOUBLEDEP) { |