Module Name: src
Committed By: rillig
Date: Thu Aug 20 17:06:26 UTC 2020
Modified Files:
src/usr.bin/make: cond.c make.h
Log Message:
make(1): fix wrong or outdated comments
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/make/cond.c
cvs rdiff -u -r1.116 -r1.117 src/usr.bin/make/make.h
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.95 src/usr.bin/make/cond.c:1.96
--- src/usr.bin/make/cond.c:1.95 Thu Aug 13 20:13:46 2020
+++ src/usr.bin/make/cond.c Thu Aug 20 17:06:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.95 2020/08/13 20:13:46 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.96 2020/08/20 17:06:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.95 2020/08/13 20:13:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.96 2020/08/20 17:06:26 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.95 2020/08/13 20:13:46 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.96 2020/08/20 17:06:26 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -121,8 +121,7 @@ __RCSID("$NetBSD: cond.c,v 1.95 2020/08/
* T -> ! T
* op -> == | != | > | < | >= | <=
*
- * 'symbol' is some other symbol to which the default function (condDefProc)
- * is applied.
+ * 'symbol' is some other symbol to which the default function is applied.
*
* Tokens are scanned from the 'condExpr' string. The scanner (CondToken)
* will return TOK_AND for '&' and '&&', TOK_OR for '|' and '||',
@@ -141,10 +140,6 @@ typedef enum {
TOK_LPAREN, TOK_RPAREN, TOK_EOF, TOK_NONE, TOK_ERROR
} Token;
-/*-
- * Structures to handle elegantly the different forms of #if's. The
- * last two fields are stored in condInvert and condDefProc, respectively.
- */
static Token CondE(Boolean);
static CondEvalResult do_Cond_EvalExpression(Boolean *);
@@ -496,6 +491,7 @@ cleanup:
return str;
}
+/* The different forms of #if's. */
static const struct If {
const char *form; /* Form of if */
int formlen; /* Length of form */
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.116 src/usr.bin/make/make.h:1.117
--- src/usr.bin/make/make.h:1.116 Thu Aug 13 03:54:57 2020
+++ src/usr.bin/make/make.h Thu Aug 20 17:06:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.116 2020/08/13 03:54:57 rillig Exp $ */
+/* $NetBSD: make.h,v 1.117 2020/08/20 17:06:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -440,7 +440,7 @@ extern pid_t myPid;
* There is one bit per module. It is up to the module what debug
* information to print.
*/
-extern FILE *debug_file; /* Output written here - default stdout */
+extern FILE *debug_file; /* Output is written here - default stderr */
extern int debug;
#define DEBUG_ARCH 0x00001
#define DEBUG_COND 0x00002
