Module Name: src
Committed By: rillig
Date: Mon Jun 21 21:07:35 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: clean up comments in cond.c
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.267 src/usr.bin/make/cond.c:1.268
--- src/usr.bin/make/cond.c:1.267 Fri Jun 11 14:52:03 2021
+++ src/usr.bin/make/cond.c Mon Jun 21 21:07:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.267 2021/06/11 14:52:03 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.268 2021/06/21 21:07:35 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.267 2021/06/11 14:52:03 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.268 2021/06/21 21:07:35 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -171,6 +171,7 @@ static CondResult CondParser_Or(CondPars
static unsigned int cond_depth = 0; /* current .if nesting level */
static unsigned int cond_min_depth = 0; /* depth at makefile open */
+/* Names for ComparisonOp. */
static const char *opname[] = { "<", "<=", ">", ">=", "==", "!=" };
/*
@@ -309,7 +310,7 @@ FuncDefined(size_t argLen MAKE_ATTR_UNUS
return result;
}
-/* See if the given target is being made. */
+/* See if the given target is requested to be made. */
/*ARGSUSED*/
static bool
FuncMake(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
@@ -682,10 +683,6 @@ CondParser_Comparison(CondParser *par, b
ComparisonOp op;
bool lhsQuoted, rhsQuoted;
- /*
- * Parse the variable spec and skip over it, saving its
- * value in lhs.
- */
CondParser_Leaf(par, doEval, lhsStrict, &lhs, &lhsQuoted);
if (lhs.str == NULL)
goto done_lhs;