diff options
| -rw-r--r-- | usr.bin/make/compat.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/gnode.h | 12 | ||||
| -rw-r--r-- | usr.bin/make/make.c | 8 | ||||
| -rw-r--r-- | usr.bin/make/targ.c | 10 |
4 files changed, 16 insertions, 18 deletions
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c index 3fbeef302db..92d34b1a313 100644 --- a/usr.bin/make/compat.c +++ b/usr.bin/make/compat.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: compat.c,v 1.67 2007/11/10 12:51:40 espie Exp $ */ +/* $OpenBSD: compat.c,v 1.68 2007/11/10 13:59:48 espie Exp $ */ /* $NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $ */ /* @@ -81,7 +81,7 @@ CompatMake(void *gnp, /* The node to make */ if (gn->type & OP_USE) { Make_HandleUse(gn, pgn); - } else if (gn->built_status == UNMADE) { + } else if (gn->built_status == UNKNOWN) { /* First mark ourselves to be made, then apply whatever * transformations the suffix module thinks are necessary. * Once that's done, we can descend and make all our children. diff --git a/usr.bin/make/gnode.h b/usr.bin/make/gnode.h index fffe984b1dd..aea2457f39f 100644 --- a/usr.bin/make/gnode.h +++ b/usr.bin/make/gnode.h @@ -1,7 +1,7 @@ #ifndef GNODE_H #define GNODE_H /* $OpenPackages$ */ -/* $OpenBSD: gnode.h,v 1.9 2007/11/10 12:51:40 espie Exp $ */ +/* $OpenBSD: gnode.h,v 1.10 2007/11/10 13:59:48 espie Exp $ */ /* * Copyright (c) 2001 Marc Espie. @@ -68,7 +68,7 @@ struct Suff_; * to create this target. */ -#define UNMADE 0 +#define UNKNOWN 0 #define BEINGMADE 1 #define MADE 2 #define UPTODATE 3 @@ -93,16 +93,14 @@ struct GNode_ { * made */ char built_status; /* Set to reflect the state of processing * on this node: - * UNMADE - Not examined yet - * BEINGMADE - Target is already being made. - * Indicates a cycle in the graph. (compat - * mode only) + * UNKNOWN - Not examined yet + * BEINGMADE - Target is currently being made. * MADE - Was out-of-date and has been made * UPTODATE - Was already up-to-date * ERROR - An error occurred while it was being * made (used only in compat mode) * ABORTED - The target was aborted due to - * an error making an inferior (compat). + * an error making an inferior. * CYCLE - Marked as potentially being part of * a graph cycle. If we come back to a * node marked this way, it is printed diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c index 8ce21ee2fd7..243fd0c8006 100644 --- a/usr.bin/make/make.c +++ b/usr.bin/make/make.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: make.c,v 1.48 2007/11/10 12:51:40 espie Exp $ */ +/* $OpenBSD: make.c,v 1.49 2007/11/10 13:59:48 espie Exp $ */ /* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */ /* @@ -209,7 +209,7 @@ Make_Update(GNode *cgn) /* the child node */ GNode *succ = (GNode *)Lst_Datum(ln); if (succ->must_make && succ->unmade == 0 - && succ->built_status == UNMADE) + && succ->built_status == UNKNOWN) (void)Lst_QueueNew(&toBeMade, succ); } } @@ -229,7 +229,7 @@ try_to_make_node(GNode *gn) for (ln = Lst_First(&gn->preds); ln != NULL; ln = Lst_Adv(ln)){ GNode *pgn = (GNode *)Lst_Datum(ln); - if (pgn->must_make && pgn->built_status == UNMADE) { + if (pgn->must_make && pgn->built_status == UNKNOWN) { if (DEBUG(MAKE)) printf( "predecessor %s not made yet.\n", @@ -342,7 +342,7 @@ MakePrintStatus( Error("Graph cycles through `%s'", gn->name); gn->built_status = ENDCYCLE; Lst_ForEach(&gn->children, MakePrintStatus, &t); - gn->built_status = UNMADE; + gn->built_status = UNKNOWN; } else if (gn->built_status != ENDCYCLE) { gn->built_status = CYCLE; Lst_ForEach(&gn->children, MakePrintStatus, &t); diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c index 77fd856c605..6477b8b2ea7 100644 --- a/usr.bin/make/targ.c +++ b/usr.bin/make/targ.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: targ.c,v 1.52 2007/11/10 12:56:50 espie Exp $ */ +/* $OpenBSD: targ.c,v 1.53 2007/11/10 13:59:48 espie Exp $ */ /* $NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $ */ /* @@ -182,7 +182,7 @@ Targ_NewGNi(const char *name, const char *ename) gn->special = SPECIAL_NONE; gn->unmade = 0; gn->must_make = false; - gn->built_status = UNMADE; + gn->built_status = UNKNOWN; gn->childMade = false; gn->order = 0; ts_set_out_of_date(gn->mtime); @@ -353,8 +353,8 @@ static const char * status_to_string(GNode *gn) { switch (gn->built_status) { - case UNMADE: - return "unmade"; + case UNKNOWN: + return "unknown"; case MADE: return "made"; case UPTODATE: @@ -381,7 +381,7 @@ TargPrintNode(GNode *gn, int pass) printf("# last modified %s: %s\n", time_to_string(gn->mtime), status_to_string(gn)); - } else if (gn->built_status != UNMADE) { + } else if (gn->built_status != UNKNOWN) { printf("# non-existent (maybe): %s\n", status_to_string(gn)); } else { |