X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=72d63b69e23a839cb10426715b7d73bda4e7610d;hb=403f4479bc9f9a864122d4aeecf7284408918302;hp=724b93581f2f448bb115f351c9af6f85a80778b3;hpb=55fa595f5626218a736295021c8053e848489d1f;p=openldap

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 724b93581f..72d63b69e2 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,4 +1,11 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#define CH_FREE 1
 
 #include "portable.h"
 
@@ -11,6 +18,8 @@
 
 #include "slap.h"
 
+#ifndef CSRIMALLOC
+
 void *
 ch_malloc(
     ber_len_t	size
@@ -21,7 +30,8 @@ ch_malloc(
 	if ( (new = (void *) ber_memalloc( size )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
 			(long) size, 0, 0 );
-		exit( 1 );
+		assert( 0 );
+		exit( EXIT_FAILURE );
 	}
 
 	return( new );
@@ -46,7 +56,8 @@ ch_realloc(
 	if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
 			(long) size, 0, 0 );
-		exit( 1 );
+		assert( 0 );
+		exit( EXIT_FAILURE );
 	}
 
 	return( new );
@@ -63,7 +74,8 @@ ch_calloc(
 	if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
 		  (long) nelem, (long) size, 0 );
-		exit( 1 );
+		assert( 0 );
+		exit( EXIT_FAILURE );
 	}
 
 	return( new );
@@ -78,7 +90,8 @@ ch_strdup(
 
 	if ( (new = ber_strdup( string )) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
-		exit( 1 );
+		assert( 0 );
+		exit( EXIT_FAILURE );
 	}
 
 	return( new );
@@ -89,3 +102,5 @@ ch_free( void *ptr )
 {
 	ber_memfree( ptr );
 }
+
+#endif