Module Name: src
Committed By: rillig
Date: Thu Nov 2 04:50:44 UTC 2023
Modified Files:
src/usr.bin/make: main.c make.h parse.c
Log Message:
make: inline a single-line cross-file function
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.600 -r1.601 src/usr.bin/make/main.c
cvs rdiff -u -r1.325 -r1.326 src/usr.bin/make/make.h
cvs rdiff -u -r1.706 -r1.707 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/main.c
diff -u src/usr.bin/make/main.c:1.600 src/usr.bin/make/main.c:1.601
--- src/usr.bin/make/main.c:1.600 Tue Sep 19 17:43:43 2023
+++ src/usr.bin/make/main.c Thu Nov 2 04:50:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.600 2023/09/19 17:43:43 rillig Exp $ */
+/* $NetBSD: main.c,v 1.601 2023/11/02 04:50:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.600 2023/09/19 17:43:43 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.601 2023/11/02 04:50:44 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -476,7 +476,7 @@ MainParseOption(char c, const char *argv
Global_Append(MAKEFLAGS, argvalue);
break;
case 'I':
- Parse_AddIncludeDir(argvalue);
+ SearchPath_Add(parseIncPath, argvalue);
Global_Append(MAKEFLAGS, "-I");
Global_Append(MAKEFLAGS, argvalue);
break;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.325 src/usr.bin/make/make.h:1.326
--- src/usr.bin/make/make.h:1.325 Sun Sep 10 11:52:29 2023
+++ src/usr.bin/make/make.h Thu Nov 2 04:50:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.325 2023/09/10 11:52:29 rillig Exp $ */
+/* $NetBSD: make.h,v 1.326 2023/11/02 04:50:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -859,7 +859,6 @@ void PrintLocation(FILE *, bool, const G
void PrintStackTrace(bool);
void Parse_Error(ParseErrorLevel, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3);
bool Parse_VarAssign(const char *, bool, GNode *) MAKE_ATTR_USE;
-void Parse_AddIncludeDir(const char *);
void Parse_File(const char *, int);
void Parse_PushInput(const char *, unsigned, unsigned, Buffer,
struct ForLoop *);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.706 src/usr.bin/make/parse.c:1.707
--- src/usr.bin/make/parse.c:1.706 Sat Aug 19 11:09:02 2023
+++ src/usr.bin/make/parse.c Thu Nov 2 04:50:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.706 2023/08/19 11:09:02 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.707 2023/11/02 04:50:44 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.706 2023/08/19 11:09:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.707 2023/11/02 04:50:44 rillig Exp $");
/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
@@ -2014,17 +2014,6 @@ GNode_AddCommand(GNode *gn, char *cmd)
}
/*
- * Add a directory to the path searched for included makefiles bracketed
- * by double-quotes.
- */
-void
-Parse_AddIncludeDir(const char *dir)
-{
- (void)SearchPath_Add(parseIncPath, dir);
-}
-
-
-/*
* Parse a directive like '.include' or '.-include'.
*
* .include "user-makefile.mk"
