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 Main_SetVarObjdir to SetVarObjdir



details:   https://anonhg.NetBSD.org/src/rev/f28ba456e174
branches:  trunk
changeset: 978250:f28ba456e174
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 14 17:39:14 2020 +0000

description:
make(1): rename Main_SetVarObjdir to SetVarObjdir

Only exported functions should be prefixed with the module name.

diffstat:

 usr.bin/make/main.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 344b9fe3d88c -r f28ba456e174 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Nov 14 17:33:51 2020 +0000
+++ b/usr.bin/make/main.c       Sat Nov 14 17:39:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.460 2020/11/14 17:29:41 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.461 2020/11/14 17:39:14 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.460 2020/11/14 17:29:41 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.461 2020/11/14 17:39:14 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -750,7 +750,7 @@
 }
 
 static Boolean
-Main_SetVarObjdir(Boolean writable, const char *var, const char *suffix)
+SetVarObjdir(Boolean writable, const char *var, const char *suffix)
 {
        void *path_freeIt;
        const char *path = Var_Value(var, VAR_CMDLINE, &path_freeIt);
@@ -1092,8 +1092,8 @@
        writable = GetBooleanVar("MAKE_OBJDIR_CHECK_WRITABLE", TRUE);
        (void)Main_SetObjdir(FALSE, "%s", curdir);
 
-       if (!Main_SetVarObjdir(writable, "MAKEOBJDIRPREFIX", curdir) &&
-           !Main_SetVarObjdir(writable, "MAKEOBJDIR", "") &&
+       if (!SetVarObjdir(writable, "MAKEOBJDIRPREFIX", curdir) &&
+           !SetVarObjdir(writable, "MAKEOBJDIR", "") &&
            !Main_SetObjdir(writable, "%s.%s-%s", _PATH_OBJDIR, machine, machine_arch) &&
            !Main_SetObjdir(writable, "%s.%s", _PATH_OBJDIR, machine) &&
            !Main_SetObjdir(writable, "%s", _PATH_OBJDIR))



Home | Main Index | Thread Index | Old Index