Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): rename init_machine to InitVarMachine
details: https://anonhg.NetBSD.org/src/rev/0074896ac4b8
branches: trunk
changeset: 956845:0074896ac4b8
user: rillig <rillig%NetBSD.org@localhost>
date: Sun Nov 08 13:10:30 2020 +0000
description:
make(1): rename init_machine to InitVarMachine
For consistency with the other Init functions.
diffstat:
usr.bin/make/main.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (47 lines):
diff -r 845b81387e7c -r 0074896ac4b8 usr.bin/make/main.c
--- a/usr.bin/make/main.c Sun Nov 08 13:05:03 2020 +0000
+++ b/usr.bin/make/main.c Sun Nov 08 13:10:30 2020 +0000
@@ -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 @@
}
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 @@
}
static const char *
-init_machine_arch(void)
+InitVarMachineArch(void)
{
const char *env = getenv("MACHINE_ARCH");
if (env != NULL)
@@ -1370,8 +1370,8 @@
* 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() */
Home |
Main Index |
Thread Index |
Old Index