X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=2b698fa1779ae7abb5067fee2cde715bdc742e1a;hb=a4d2c63a61fca123d7f54aa84c79ba4b496242a9;hp=c9af173946e0f06c03a56f9692ba91f180de5678;hpb=6107ba67d2fd7eadb23ffdd1d284306011ef4013;p=openldap

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index c9af173946..2b698fa177 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,8 +1,27 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #define CH_FREE 1
@@ -18,7 +37,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,14 +51,9 @@ ch_malloc(
 {
 	void	*new;
 
-	if ( (new = (void *) ber_memalloc( size )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			   "ch_malloc: allocation of %lu bytes failed\n", (long)size, 0,0 );
-#else
+	if ( (new = (void *) ber_memalloc_x( size, NULL )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
 			(long) size, 0, 0 );
-#endif
 		assert( 0 );
 		exit( EXIT_FAILURE );
 	}
@@ -48,7 +67,7 @@ ch_realloc(
     ber_len_t	size
 )
 {
-	void	*new;
+	void	*new, *ctx;
 
 	if ( block == NULL ) {
 		return( ch_malloc( size ) );
@@ -58,14 +77,14 @@ ch_realloc(
 		ch_free( block );
 	}
 
-	if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			   "ch_realloc: reallocation of %lu bytes failed\n", (long)size, 0,0 );
-#else
+	ctx = slap_sl_context( block );
+	if ( ctx ) {
+		return slap_sl_realloc( block, size, ctx );
+	}
+
+	if ( (new = (void *) ber_memrealloc_x( block, size, NULL )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
 			(long) size, 0, 0 );
-#endif
 		assert( 0 );
 		exit( EXIT_FAILURE );
 	}
@@ -81,15 +100,9 @@ ch_calloc(
 {
 	void	*new;
 
-	if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			   "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
-			   (long)nelem, (long)size, 0 );
-#else
+	if ( (new = (void *) ber_memcalloc_x( nelem, size, NULL )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
 		  (long) nelem, (long) size, 0 );
-#endif
 		assert( 0 );
 		exit( EXIT_FAILURE );
 	}
@@ -104,13 +117,8 @@ ch_strdup(
 {
 	char	*new;
 
-	if ( (new = ber_strdup( string )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"chr_strdup: duplication of \"%s\" failed\n", string, 0, 0 );
-#else
+	if ( (new = ber_strdup_x( string, NULL )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
-#endif
 		assert( 0 );
 		exit( EXIT_FAILURE );
 	}
@@ -121,7 +129,13 @@ ch_strdup(
 void
 ch_free( void *ptr )
 {
-	ber_memfree( ptr );
+	void *ctx;
+
+	ctx = slap_sl_context( ptr );
+	if (ctx) {
+		slap_sl_free( ptr, ctx );
+	} else {
+		ber_memfree_x( ptr, NULL );
+	}
 }
 
-#endif