Module Name: src
Committed By: rillig
Date: Mon Feb 1 22:16:58 UTC 2021
Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: directive-include-fatal.mk
Log Message:
make: rename Parse_include_file to IncludeFile
To generate a diff of this commit:
cvs rdiff -u -r1.536 -r1.537 src/usr.bin/make/parse.c
cvs rdiff -u -r1.2 -r1.3 \
src/usr.bin/make/unit-tests/directive-include-fatal.mk
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/parse.c
diff -u src/usr.bin/make/parse.c:1.536 src/usr.bin/make/parse.c:1.537
--- src/usr.bin/make/parse.c:1.536 Mon Feb 1 22:06:05 2021
+++ src/usr.bin/make/parse.c Mon Feb 1 22:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.536 2021/02/01 22:06:05 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.537 2021/02/01 22:16:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -84,7 +84,7 @@
* Parse_End Clean up the module
*
* Parse_File Parse a top-level makefile. Included files are
- * handled by Parse_include_file though.
+ * handled by IncludeFile instead.
*
* Parse_IsVar Return TRUE if the given line is a variable
* assignment. Used by MainParseArgs to determine if
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.536 2021/02/01 22:06:05 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.537 2021/02/01 22:16:57 rillig Exp $");
/* types and constants */
@@ -2102,7 +2102,7 @@ Parse_AddIncludeDir(const char *dir)
* line options.
*/
static void
-Parse_include_file(char *file, Boolean isSystem, Boolean depinc, Boolean silent)
+IncludeFile(char *file, Boolean isSystem, Boolean depinc, Boolean silent)
{
struct loadedfile *lf;
char *fullname; /* full pathname of file */
@@ -2253,7 +2253,7 @@ ParseDoInclude(char *directive)
(void)Var_Subst(file, VAR_CMDLINE, VARE_WANTRES, &file);
/* TODO: handle errors */
- Parse_include_file(file, endc == '>', directive[0] == 'd', silent);
+ IncludeFile(file, endc == '>', directive[0] == 'd', silent);
free(file);
}
@@ -2506,7 +2506,7 @@ ParseTraditionalInclude(char *line)
else
done = TRUE;
- Parse_include_file(file, FALSE, FALSE, silent);
+ IncludeFile(file, FALSE, FALSE, silent);
}
out:
free(all_files);
Index: src/usr.bin/make/unit-tests/directive-include-fatal.mk
diff -u src/usr.bin/make/unit-tests/directive-include-fatal.mk:1.2 src/usr.bin/make/unit-tests/directive-include-fatal.mk:1.3
--- src/usr.bin/make/unit-tests/directive-include-fatal.mk:1.2 Sun Sep 13 10:20:11 2020
+++ src/usr.bin/make/unit-tests/directive-include-fatal.mk Mon Feb 1 22:16:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: directive-include-fatal.mk,v 1.2 2020/09/13 10:20:11 rillig Exp $
+# $NetBSD: directive-include-fatal.mk,v 1.3 2021/02/01 22:16:57 rillig Exp $
#
# Test for the .include directive combined with fatal errors.
#
@@ -6,7 +6,7 @@
# suspicious, as if it were possible to suppress fatal errors by including
# another file. It was a false alarm though, since Parse_File only handles
# the top-level makefiles from the command line. Any included files are
-# handled by Parse_include_file instead, and that function does not reset
+# handled by IncludeFile instead, and that function does not reset
# the "fatals" counter.
# Using an undefined variable in a condition generates a fatal error.
