Module Name: src
Committed By: rillig
Date: Wed Nov 4 13:31:58 UTC 2020
Modified Files:
src/usr.bin/make: make.h parse.c
Log Message:
make(1): align comments on a few commonly used variables
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/make/make.h
cvs rdiff -u -r1.425 -r1.426 src/usr.bin/make/parse.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/make.h
diff -u src/usr.bin/make/make.h:1.186 src/usr.bin/make/make.h:1.187
--- src/usr.bin/make/make.h:1.186 Wed Nov 4 13:29:42 2020
+++ src/usr.bin/make/make.h Wed Nov 4 13:31:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.186 2020/11/04 13:29:42 rillig Exp $ */
+/* $NetBSD: make.h,v 1.187 2020/11/04 13:31:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -460,10 +460,11 @@ extern SearchPath *sysIncPath;
/* The default for sysIncPath. */
extern SearchPath *defSysIncPath;
-extern char curdir[]; /* Startup directory */
-extern char *progname; /* The program name */
-extern char *makeDependfile; /* .depend */
-extern char **savedEnv; /* if we replaced environ this will be non-NULL */
+extern char curdir[]; /* Startup directory */
+extern char *progname; /* The program name */
+extern char *makeDependfile; /* .depend */
+/* If we replaced environ, this will be non-NULL. */
+extern char **savedEnv;
extern int makelevel;
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.425 src/usr.bin/make/parse.c:1.426
--- src/usr.bin/make/parse.c:1.425 Wed Nov 4 06:09:55 2020
+++ src/usr.bin/make/parse.c Wed Nov 4 13:31:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.425 2020/11/04 06:09:55 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.426 2020/11/04 13:31:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.425 2020/11/04 06:09:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.426 2020/11/04 13:31:58 rillig Exp $");
/* types and constants */
@@ -125,7 +125,7 @@ MAKE_RCSID("$NetBSD: parse.c,v 1.425 202
* Structure for a file being read ("included file")
*/
typedef struct IFile {
- char *fname; /* name of file */
+ char *fname; /* name of file (relative? absolute?) */
Boolean fromForLoop; /* simulated .include by the .for loop */
int lineno; /* current line number in file */
int first_lineno; /* line number of start of text */