diff options
Diffstat (limited to 'contrib/bmake/make.c')
| -rw-r--r-- | contrib/bmake/make.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/contrib/bmake/make.c b/contrib/bmake/make.c index 2c1a243965f1..5fb8f8840772 100644 --- a/contrib/bmake/make.c +++ b/contrib/bmake/make.c @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.248 2021/11/28 23:12:51 rillig Exp $ */ +/* $NetBSD: make.c,v 1.252 2022/01/09 15:48:30 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -104,7 +104,7 @@ #include "job.h" /* "@(#)make.c 8.1 (Berkeley) 6/6/93" */ -MAKE_RCSID("$NetBSD: make.c,v 1.248 2021/11/28 23:12:51 rillig Exp $"); +MAKE_RCSID("$NetBSD: make.c,v 1.252 2022/01/09 15:48:30 rillig Exp $"); /* Sequence # to detect recursion. */ static unsigned int checked_seqno = 1; @@ -120,11 +120,11 @@ static GNodeList toBeMade = LST_INIT; void debug_printf(const char *fmt, ...) { - va_list args; + va_list ap; - va_start(args, fmt); - vfprintf(opts.debug_file, fmt, args); - va_end(args); + va_start(ap, fmt); + vfprintf(opts.debug_file, fmt, ap); + va_end(ap); } MAKE_ATTR_DEAD static void @@ -370,9 +370,8 @@ GNode_IsOODate(GNode *gn) } #ifdef USE_META - if (useMeta) { + if (useMeta) oodate = meta_oodate(gn, oodate); - } #endif /* @@ -599,8 +598,9 @@ Make_Recheck(GNode *gn) } #endif - /* XXX: The returned mtime may differ from gn->mtime. - * Intentionally? */ + /* + * XXX: The returned mtime may differ from gn->mtime. Intentionally? + */ return mtime; } @@ -952,7 +952,9 @@ MakeBuildChild(GNode *cn, GNodeListNode *toBeMadeNext) /* If this node is on the RHS of a .ORDER, check LHSs. */ if (IsWaitingForOrder(cn)) { - /* Can't build this (or anything else in this child list) yet */ + /* + * Can't build this (or anything else in this child list) yet + */ cn->made = DEFERRED; return false; /* but keep looking */ } @@ -1070,7 +1072,7 @@ MakeStartJobs(void) gn->made = BEINGMADE; if (GNode_IsOODate(gn)) { DEBUG0(MAKE, "out-of-date\n"); - if (opts.queryFlag) + if (opts.query) return true; GNode_SetLocalVars(gn); Job_Make(gn); @@ -1327,7 +1329,9 @@ add_wait_dependency(GNodeListNode *owln, GNode *wn) DEBUG3(MAKE, ".WAIT: add dependency %s%s -> %s\n", cn->name, cn->cohort_num, wn->name); - /* XXX: This pattern should be factored out, it repeats often */ + /* + * XXX: This pattern should be factored out, it repeats often + */ Lst_Append(&wn->children, cn); wn->unmade++; Lst_Append(&cn->parents, wn); @@ -1436,7 +1440,7 @@ Make_Run(GNodeList *targs) Targ_PrintGraph(1); } - if (opts.queryFlag) { + if (opts.query) { /* * We wouldn't do any work unless we could start some jobs * in the next loop... (we won't actually start any, of |