misc cleanup

[openldap] / servers / slapd / ch_malloc.c

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index a1ea2d31ce4858134acf70449247f08e7e168122..92d6a7da26821d3f43b0bbe2b0cc460094e4b1cc 100644 (file)
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,7 +1,7 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,7 +18,12 @@
 
 #include "slap.h"
 
-#ifndef CSRIMALLOC
+BerMemoryFunctions ch_mfuncs = {
+       (BER_MEMALLOC_FN *)ch_malloc,
+       (BER_MEMCALLOC_FN *)ch_calloc,
+       (BER_MEMREALLOC_FN *)ch_realloc,
+       (BER_MEMFREE_FN *)ch_free 
+};
 
 void *
 ch_malloc(
@@ -27,11 +32,10 @@ ch_malloc(
 {
        void    *new;
 
-       if ( (new = (void *) ber_memalloc( size )) == NULL ) {
+       if ( (new = (void *) ber_memalloc_x( size, NULL )) == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "ch_malloc: allocation of %lu bytes failed\n",
-                          (long)size ));
+               LDAP_LOG( OPERATION, ERR, 
+                          "ch_malloc: allocation of %lu bytes failed\n", (long)size, 0,0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
                        (long) size, 0, 0 );
@@ -49,7 +53,7 @@ ch_realloc(
     ber_len_t  size
 )
 {
-       void    *new;
+       void    *new, *ctx;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
@@ -59,10 +63,15 @@ ch_realloc(
                ch_free( block );
        }
 
-       if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
+       ctx = sl_context( block );
+       if ( ctx ) {
+               return sl_realloc( block, size, ctx );
+       }
+
+       if ( (new = (void *) ber_memrealloc_x( block, size, NULL )) == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "ch_realloc: reallocation of %lu bytes failed\n", (long)size ));
+               LDAP_LOG( OPERATION, ERR, 
+                          "ch_realloc: reallocation of %lu bytes failed\n", (long)size, 0,0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
                        (long) size, 0, 0 );
@@ -82,11 +91,11 @@ ch_calloc(
 {
        void    *new;
 
-       if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
+       if ( (new = (void *) ber_memcalloc_x( nelem, size, NULL )) == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+               LDAP_LOG( OPERATION, ERR, 
                           "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
-                          (long)nelem, (long)size ));
+                          (long)nelem, (long)size, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
                  (long) nelem, (long) size, 0 );
@@ -105,10 +114,10 @@ ch_strdup(
 {
        char    *new;
 
-       if ( (new = ber_strdup( string )) == NULL ) {
+       if ( (new = ber_strdup_x( string, NULL )) == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "chr_strdup: duplication of \"%s\" failed\n", string ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "chr_strdup: duplication of \"%s\" failed\n", string, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
 #endif
@@ -122,7 +131,13 @@ ch_strdup(
 void
 ch_free( void *ptr )
 {
-       ber_memfree( ptr );
+       void *ctx;
+
+       ctx = sl_context( ptr );
+       if (ctx) {
+               sl_free( ptr, ctx );
+       } else {
+               ber_memfree_x( ptr, NULL );
+       }
 }
 
-#endif