From 5144dd6833fa60ba443d4d36c6cee64d0a382240 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Wed, 13 Nov 2019 15:13:11 +0200
Subject: Namespace cleanup

* src/proto.h (_gdbm_cache_tree_delete): Remove.
(_gdbm_rbt_remove_node): Rename to _gdbm_cache_tree_delete.
All uses changed
---
 src/bucket.c    |  2 +-
 src/cachetree.c | 31 ++-----------------------------
 src/proto.h     |  3 +--
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/src/bucket.c b/src/bucket.c
index 4bce594..f04423c 100644
--- a/src/bucket.c
+++ b/src/bucket.c
@@ -159,7 +159,7 @@ _gdbm_cache_elem_new (GDBM_FILE dbf, off_t adr)
 static void
 cache_elem_free (GDBM_FILE dbf, cache_elem *elem)
 {
-  _gdbm_rbt_remove_node (dbf->cache_tree, elem->ca_node);
+  _gdbm_cache_tree_delete (dbf->cache_tree, elem->ca_node);
   lru_unlink_elem (dbf, elem);
   elem->ca_next = dbf->cache_avail;
   dbf->cache_avail = elem;
diff --git a/src/cachetree.c b/src/cachetree.c
index b27d8a7..0851d09 100644
--- a/src/cachetree.c
+++ b/src/cachetree.c
@@ -165,7 +165,7 @@ static void rbt_delete_fixup (cache_tree *tree, cache_node *n);
 
 /* Remove N from the TREE. */
 void
-_gdbm_rbt_remove_node (cache_tree *tree, cache_node *n)
+_gdbm_cache_tree_delete (cache_tree *tree, cache_node *n)
 {
   cache_node *child;
 
@@ -476,7 +476,7 @@ _gdbm_cache_tree_destroy (cache_tree *tree)
 {
   cache_node *n;
   while ((n = tree->root) != NULL)
-    _gdbm_rbt_remove_node (tree, n);
+    _gdbm_cache_tree_delete (tree, n);
   while ((n = tree->avail) != NULL)
     {
       tree->avail = n->parent;
@@ -485,33 +485,6 @@ _gdbm_cache_tree_destroy (cache_tree *tree)
   free (tree);
 }
 
-/* Delete the node with ELEM from the TREE.
-   Note, that it actually removes the node whith elem->ca_adr equal to
-   that of ELEM, which means that it's elem pointer could theoretically
-   have differ from ELEM.  However, the actual algorithm ensures it is
-   the same.
-*/
-int
-_gdbm_cache_tree_delete (cache_tree *tree, cache_elem *elem)
-{
-  cache_node *n;
-  
-  switch (cache_tree_lookup (tree, elem->ca_adr, 0, &n))
-    {
-    case node_found:
-      assert (n->elem == elem);
-      _gdbm_rbt_remove_node (tree, n);
-      break;
-
-    case node_new:
-      break;
-      
-    case node_failure:
-      return -1;
-    }
-  return 0;
-}
-
 /* Look up the node with elem->ca_adr equal to ADR.
    If found, store its pointer in *RETVAL and return node_found.
    Otherwise, return node_new and don't touch RETVAL.
diff --git a/src/proto.h b/src/proto.h
index 2bd7956..816da86 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -90,8 +90,7 @@ int _gdbm_next_bucket_dir (GDBM_FILE dbf, int bucket_dir);
 /* cachetree.c */
 cache_tree *_gdbm_cache_tree_alloc (GDBM_FILE dbf);
 void _gdbm_cache_tree_destroy (cache_tree *tree);
-int _gdbm_cache_tree_delete (cache_tree *tree, cache_elem *elem);
-void _gdbm_rbt_remove_node (cache_tree *tree, struct cache_node *n);
+void _gdbm_cache_tree_delete (cache_tree *tree, struct cache_node *n);
 
 /* Return codes for _gdbm_cache_tree_lookup. */
 enum
-- 
cgit v1.2.1