[src/trunk]: src/usr.bin/make make(1): rename Dir_Destroy to CachedDir_Destroy

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1c7a5c93cf2
branches:  trunk
changeset: 957472:a1c7a5c93cf2
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Nov 29 09:38:04 2020 +0000

description:
make(1): rename Dir_Destroy to CachedDir_Destroy

It is no longer exported by the Dir module.

diffstat:

 usr.bin/make/dir.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (88 lines):

diff -r f4d0bd224065 -r a1c7a5c93cf2 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Sun Nov 29 09:27:40 2020 +0000
+++ b/usr.bin/make/dir.c        Sun Nov 29 09:38:04 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.229 2020/11/29 08:48:24 rillig Exp $ */
+/*     $NetBSD: dir.c,v 1.230 2020/11/29 09:38:04 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.229 2020/11/29 08:48:24 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.230 2020/11/29 09:38:04 rillig Exp $");
 
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -255,7 +255,7 @@
        HashTable_Init(&odirs->table);
 }
 
-static void Dir_Destroy(CachedDir *);
+static void CachedDir_Destroy(CachedDir *);
 
 #ifdef CLEANUP
 static void
@@ -265,7 +265,7 @@
        while (ln != NULL) {
                CachedDirListNode *next = ln->next;
                CachedDir *dir = ln->datum;
-               Dir_Destroy(dir);       /* removes the dir from odirs->list */
+               CachedDir_Destroy(dir); /* removes the dir from odirs->list */
                ln = next;
        }
        Lst_Done(&odirs->list);
@@ -441,7 +441,7 @@
                 * We've been here before, clean up.
                 */
                cur->refCount--;
-               Dir_Destroy(cur);
+               CachedDir_Destroy(cur);
        }
        cur = dir;
 }
@@ -478,12 +478,12 @@
 #ifdef CLEANUP
        if (cur != NULL) {
                cur->refCount--;
-               Dir_Destroy(cur);
+               CachedDir_Destroy(cur);
        }
        dot->refCount--;
        dotLast->refCount--;
-       Dir_Destroy(dotLast);
-       Dir_Destroy(dot);
+       CachedDir_Destroy(dotLast);
+       CachedDir_Destroy(dot);
        SearchPath_Clear(&dirSearchPath);
        OpenDirs_Done(&openDirs);
        HashTable_Done(&mtimes);
@@ -1561,7 +1561,7 @@
  *     dirp            The directory descriptor to nuke
  */
 static void
-Dir_Destroy(CachedDir *dir)
+CachedDir_Destroy(CachedDir *dir)
 {
        dir->refCount--;
 
@@ -1582,7 +1582,7 @@
 
        for (ln = path->first; ln != NULL; ln = ln->next) {
                CachedDir *dir = ln->datum;
-               Dir_Destroy(dir);
+               CachedDir_Destroy(dir);
        }
        Lst_Free(path);
 }
@@ -1594,7 +1594,7 @@
 {
        while (!Lst_IsEmpty(path)) {
                CachedDir *dir = Lst_Dequeue(path);
-               Dir_Destroy(dir);
+               CachedDir_Destroy(dir);
        }
 }