Rework set_malloc/set_alloc calls

diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index 585f8040c66b4dfe928f0ab005412773b4a60f6d..03112e37f64b43f4778065c82e7cffb074f03333 100644 (file)
--- 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 */