summaryrefslogtreecommitdiff
path: root/usr.bin/make/make.c
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2021-12-27 18:26:22 +0000
committerrillig <rillig@NetBSD.org>2021-12-27 18:26:22 +0000
commit7c8de358685bcb54e7d8ca6ff0e68244f27d1ed4 (patch)
tree282898a122c3ef9d0250d414ce5de593c22f18f8 /usr.bin/make/make.c
parent802525406eefb0d4e9eb06aad7b5b03bfd55609c (diff)
make: remove unnecessary words from command line options
Several years ago, the command line options were individual global variables. The global variable could therefore not be named 'silent' since that would have conflicted with local variables of the same name. After moving the global variable to the namespace 'struct CmdOpts', there is no conflict anymore. There doesn't seem to be any risk of naming collisions for the names 'touch' and 'query'. No functional change.
Diffstat (limited to 'usr.bin/make/make.c')
-rw-r--r--usr.bin/make/make.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index f0a0ebfe5e6..aac97f90c04 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.249 2021/12/15 12:58:01 rillig Exp $ */
+/* $NetBSD: make.c,v 1.250 2021/12/27 18:26:22 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.249 2021/12/15 12:58:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.250 2021/12/27 18:26:22 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -1073,7 +1073,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);
@@ -1441,7 +1441,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