diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c index 67414ba631b3..c432384a1092 100644 --- a/usr.bin/make/dir.c +++ b/usr.bin/make/dir.c @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.245 2020/11/30 20:25:37 rillig Exp $ */ +/* $NetBSD: dir.c,v 1.246 2020/12/01 19:28:32 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -136,7 +136,7 @@ #include "job.h" /* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */ -MAKE_RCSID("$NetBSD: dir.c,v 1.245 2020/11/30 20:25:37 rillig Exp $"); +MAKE_RCSID("$NetBSD: dir.c,v 1.246 2020/12/01 19:28:32 rillig Exp $"); #define DIR_DEBUG0(text) DEBUG0(DIR, text) #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1) @@ -475,13 +475,6 @@ Dir_Init(void) OpenDirs_Init(&openDirs); HashTable_Init(&mtimes); HashTable_Init(&lmtimes); -} - -void -Dir_InitDir(const char *cdname) -{ - Dir_InitCur(cdname); - CachedDir_Assign(&dotLast, CachedDir_New(".DOTLAST")); } diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h index 595c8b884a18..9d9002b166be 100644 --- a/usr.bin/make/dir.h +++ b/usr.bin/make/dir.h @@ -1,4 +1,4 @@ -/* $NetBSD: dir.h,v 1.39 2020/11/29 09:27:40 rillig Exp $ */ +/* $NetBSD: dir.h,v 1.40 2020/12/01 19:28:32 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -78,7 +78,6 @@ typedef struct CachedDir CachedDir; void Dir_Init(void); -void Dir_InitDir(const char *); void Dir_InitCur(const char *); void Dir_InitDot(void); void Dir_End(void); diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 6ec1ec0d0ec1..5c9c561b9b36 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.490 2020/11/29 01:40:26 rillig Exp $ */ +/* $NetBSD: main.c,v 1.491 2020/12/01 19:28:32 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.490 2020/11/29 01:40:26 rillig Exp $"); +MAKE_RCSID("$NetBSD: main.c,v 1.491 2020/12/01 19:28:32 rillig Exp $"); #if defined(MAKE_NATIVE) && !defined(lint) __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 " "The Regents of the University of California. " @@ -1091,7 +1091,7 @@ InitObjdir(const char *machine, const char *machine_arch) { Boolean writable; - Dir_InitDir(curdir); + Dir_InitCur(curdir); writable = GetBooleanVar("MAKE_OBJDIR_CHECK_WRITABLE", TRUE); (void)Main_SetObjdir(FALSE, "%s", curdir);