From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 8 Oct 2001 02:44:42 +0000 (+0000)
Subject: Move set_alloc calls
X-Git-Tag: OPENLDAP_REL_ENG_2_0_16~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11efcf986174b825935a469f47245cbffca8a916;p=thirdparty%2Fopenldap.git

Move set_alloc calls
---

diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index f10ff032f0..585f8040c6 100644
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -230,6 +230,12 @@ DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok)
 		return NULL;
 	}
 
+#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 );
 	env->set_errpfx( env, "==>" );
 	if (dbcachesize) {
@@ -315,11 +321,6 @@ ldbm_open( DB_ENV *env, char *name, int rw, int mode, int dbcachesize )
 	ret->set_pagesize( ret, DEFAULT_DB_PAGE_SIZE );
 
 	/* likely should use ber_mem* routines */
-#if DB_VERSION_MINOR >= 3
-	ret->set_alloc( ret, ldbm_malloc, NULL, NULL );
-#else
-	ret->set_malloc( ret, ldbm_malloc );
-#endif
 
 	err = ret->open( ret, name, NULL, DB_TYPE, rw, mode);