Add OpenLDAP RCSid to *.[ch] in clients, libraries, and servers.

[openldap] / servers / slapd / ch_malloc.c

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 27b7cca7696592b287f1f682cd2cb3b55dc7819d..72d63b69e23a839cb10426715b7d73bda4e7610d 100644 (file)
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,9 +1,12 @@
 /* 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"
 
 #include <stdio.h>
@@ -15,6 +18,8 @@
 
 #include "slap.h"
 
+#ifndef CSRIMALLOC
+
 void *
 ch_malloc(
     ber_len_t  size
@@ -25,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( EXIT_SUCCESS );
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -50,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( EXIT_SUCCESS );
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -67,6 +74,7 @@ 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 );
+               assert( 0 );
                exit( EXIT_FAILURE );
        }
 
@@ -82,6 +90,7 @@ ch_strdup(
 
        if ( (new = ber_strdup( string )) == NULL ) {
                Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
+               assert( 0 );
                exit( EXIT_FAILURE );
        }
 
@@ -93,3 +102,5 @@ ch_free( void *ptr )
 {
        ber_memfree( ptr );
 }
+
+#endif