* hash/extern.h: Additional renaming

	* hash/hash_page.c (page_to_oaddr):
	(is_bitmap_pgno): Declare static to avoid leaking symbols.

	* hash/search.h: Additional renaming.

	* hash/hash_log2.c (__log2): Rename explicitly.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10444 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/db2/hash/extern.h b/src/util/db2/hash/extern.h
index dd8a34e8effbe983cd3786ab75a936243f2ce0e7..872b6b0fef86b8fbfc38ed272199822111421838 100644 (file)
--- a/src/util/db2/hash/extern.h
+++ b/src/util/db2/hash/extern.h
@@ -33,6 +33,39 @@
  *     @(#)extern.h    8.8 (Berkeley) 11/7/95
  */
 
+#define __add_bigpage          __kdb2_add_bigpage
+#define __add_ovflpage         __kdb2_add_ovflpage
+#define __addel                        __kdb2_addel
+#define __alloc_tmp            __kdb2_alloc_tmp
+#define __big_delete           __kdb2_big_delete
+#define __big_insert           __kdb2_big_insert
+#define __big_keydata          __kdb2_big_keydata
+#define __big_return           __kdb2_big_return
+#define __call_hash            __kdb2_call_hash
+#define __cursor_creat         __kdb2_cursor_creat
+#define __delete_page          __kdb2_delete_page
+#define __delpair              __kdb2_delpair
+#define __expand_table         __kdb2_expand_table
+#define __find_bigpair         __kdb2_find_bigpair
+#define __free_ovflpage                __kdb2_free_ovflpage
+#define __get_bigkey           __kdb2_get_bigkey
+#define __get_buf              __kdb2_get_buf
+#define __get_item             __kdb2_get_item
+#define __get_item_done                __kdb2_get_item_done
+#define __get_item_first       __kdb2_get_item_first
+#define __get_item_next                __kdb2_get_item_next
+#define __get_item_reset       __kdb2_get_item_reset
+#define __get_page             __kdb2_get_page
+#define __ibitmap              __kdb2_ibitmap
+#define __log2                 __kdb2_log2
+#define __new_page             __kdb2_new_page
+#define __pgin_routine         __kdb2_pgin_routine
+#define __pgout_routine                __kdb2_pgout_routine
+#define __put_buf              __kdb2_put_buf
+#define __put_page             __kdb2_put_page
+#define __reclaim_tmp          __kdb2_reclaim_tmp
+#define __split_page           __kdb2_split_page
+
 PAGE16  *__add_bigpage __P((HTAB *, PAGE16 *, indx_t, const u_int8_t));
 PAGE16  *__add_ovflpage __P((HTAB *, PAGE16 *));
 int32_t          __addel __P((HTAB *, ITEM_INFO *,

diff --git a/src/util/db2/hash/hash_log2.c b/src/util/db2/hash/hash_log2.c
index 8604945e807ae9c146af40de9868eb6ad03d5177..27ca9ba52e2838f433611469d03e334254fcaf30 100644 (file)
--- a/src/util/db2/hash/hash_log2.c
+++ b/src/util/db2/hash/hash_log2.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)hash_log2.c       8.4 (Berkeley) 11/7/95";
 #include "db-int.h"
 
 u_int32_t
-__log2(num)
+__kdb2_log2(num)
        u_int32_t num;
 {
        u_int32_t i, limit;

diff --git a/src/util/db2/hash/hash_page.c b/src/util/db2/hash/hash_page.c
index 304b0fc8adf2ac37f62ec973034a28871546229b..83146606fb584de7f513df9914b1ad0c7a415b97 100644 (file)
--- a/src/util/db2/hash/hash_page.c
+++ b/src/util/db2/hash/hash_page.c
@@ -840,7 +840,7 @@ __delete_page(hashp, pagep, page_type)
        return (mpool_delete(hashp->mp, pagep));
 }
 
-u_int8_t
+static u_int8_t
 is_bitmap_pgno(hashp, pgno)
        HTAB *hashp;
        db_pgno_t pgno;
@@ -1258,7 +1258,7 @@ oaddr_to_page(hashp, n)
 }
 #endif /* DEBUG */
 
-indx_t
+static indx_t
 page_to_oaddr(hashp, pgno)
        HTAB *hashp;
        db_pgno_t pgno;

diff --git a/src/util/db2/hash/search.h b/src/util/db2/hash/search.h
index 4d3b9143e734d6e484d2b542151f0f80fa7cebc0..6d6a0a82f41cbccb83205f662295d34163e7d63c 100644 (file)
--- a/src/util/db2/hash/search.h
+++ b/src/util/db2/hash/search.h
@@ -46,6 +46,10 @@ typedef enum {
        FIND, ENTER
 } ACTION;
 
+#define hcreate                kdb2_hcreate
+#define hdestroy       kdb2_hdestroy
+#define hsearch                kdb2_hsearch
+
 int     hcreate __P((unsigned int));
 void    hdestroy __P((void));
 ENTRY  *hsearch __P((ENTRY, ACTION));