Module Name: src
Committed By: rillig
Date: Sat Feb 25 00:07:08 UTC 2023
Modified Files:
src/usr.bin/make: main.c
src/usr.bin/make/unit-tests: opt.mk
Log Message:
make: rename function for parsing command line options
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.591 -r1.592 src/usr.bin/make/main.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt.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/main.c
diff -u src/usr.bin/make/main.c:1.591 src/usr.bin/make/main.c:1.592
--- src/usr.bin/make/main.c:1.591 Wed Feb 15 06:52:58 2023
+++ src/usr.bin/make/main.c Sat Feb 25 00:07:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.591 2023/02/15 06:52:58 rillig Exp $ */
+/* $NetBSD: main.c,v 1.592 2023/02/25 00:07:08 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.591 2023/02/15 06:52:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.592 2023/02/25 00:07:08 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -432,7 +432,7 @@ MainParseArgSysInc(const char *argvalue)
}
static bool
-MainParseArg(char c, const char *argvalue)
+MainParseOption(char c, const char *argvalue)
{
switch (c) {
case '\0':
@@ -624,7 +624,7 @@ rearg:
dashDash = true;
break;
default:
- if (!MainParseArg(c, argvalue))
+ if (!MainParseOption(c, argvalue))
goto noarg;
}
argv += arginc;
Index: src/usr.bin/make/unit-tests/opt.mk
diff -u src/usr.bin/make/unit-tests/opt.mk:1.6 src/usr.bin/make/unit-tests/opt.mk:1.7
--- src/usr.bin/make/unit-tests/opt.mk:1.6 Wed Nov 18 01:06:59 2020
+++ src/usr.bin/make/unit-tests/opt.mk Sat Feb 25 00:07:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: opt.mk,v 1.6 2020/11/18 01:06:59 sjg Exp $
+# $NetBSD: opt.mk,v 1.7 2023/02/25 00:07:08 rillig Exp $
#
# Tests for the command line options.
@@ -7,7 +7,7 @@
all: .IGNORE
# The options from the top-level make are passed to the sub-makes via
# the environment variable MAKEFLAGS. This is where the " -r -k -d 0"
- # comes from. See MainParseArg.
+ # comes from. See MainParseOption.
${MAKE} -r -f /dev/null -V MAKEFLAGS
@echo
