From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 9 Oct 2001 19:54:38 +0000 (+0000)
Subject: Rework set_malloc/set_alloc calls
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~978
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b9a5fb52e047984685738c63f59602a885f4eb3f;p=openldap

Rework set_malloc/set_alloc calls
---

diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index 585f8040c6..03112e37f6 100644
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -232,8 +232,6 @@ DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok)
 
 #if DB_VERSION_MINOR >= 3
 	env->set_alloc( env, ldbm_malloc, NULL, NULL );
-#else
-	env->set_malloc( env, ldbm_malloc );
 #endif
 
 	env->set_errcall( env, ldbm_db_errcall );
@@ -318,6 +316,10 @@ ldbm_open( DB_ENV *env, char *name, int rw, int mode, int dbcachesize )
 		return NULL;
 	}
 
+#if DB_VERSION_MINOR < 3
+	ret->set_malloc( ret, ldbm_malloc );
+#endif
+
 	ret->set_pagesize( ret, DEFAULT_DB_PAGE_SIZE );
 
 	/* likely should use ber_mem* routines */