Module Name: src
Committed By: rillig
Date: Sun Nov 8 13:10:30 UTC 2020
Modified Files:
src/usr.bin/make: main.c
Log Message:
make(1): rename init_machine to InitVarMachine
For consistency with the other Init functions.
To generate a diff of this commit:
cvs rdiff -u -r1.450 -r1.451 src/usr.bin/make/main.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.450 src/usr.bin/make/main.c:1.451
--- src/usr.bin/make/main.c:1.450 Sun Nov 8 13:05:03 2020
+++ src/usr.bin/make/main.c Sun Nov 8 13:10:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.450 2020/11/08 13:05:03 rillig Exp $ */
+/* $NetBSD: main.c,v 1.451 2020/11/08 13:10:30 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.450 2020/11/08 13:05:03 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.451 2020/11/08 13:10:30 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -982,7 +982,7 @@ InitRandom(void)
}
static const char *
-init_machine(const struct utsname *utsname)
+InitVarMachine(const struct utsname *utsname)
{
const char *machine = getenv("MACHINE");
if (machine != NULL)
@@ -1000,7 +1000,7 @@ init_machine(const struct utsname *utsna
}
static const char *
-init_machine_arch(void)
+InitVarMachineArch(void)
{
const char *env = getenv("MACHINE_ARCH");
if (env != NULL)
@@ -1370,8 +1370,8 @@ main_Init(int argc, char **argv)
* Note that both MACHINE and MACHINE_ARCH are decided at
* run-time.
*/
- machine = init_machine(&utsname);
- machine_arch = init_machine_arch();
+ machine = InitVarMachine(&utsname);
+ machine_arch = InitVarMachineArch();
myPid = getpid(); /* remember this for vFork() */
