More places where LOCK_ID() calls need to be checked.

[openldap] / servers / slapd / ch_malloc.c

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 724b93581f2f448bb115f351c9af6f85a80778b3..c9af173946e0f06c03a56f9692ba91f180de5678 100644 (file)
--- 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-2002 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
@@ -19,9 +28,15 @@ 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
                Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
                        (long) size, 0, 0 );
-               exit( 1 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -44,9 +59,15 @@ ch_realloc(
        }
 
        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
                Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
                        (long) size, 0, 0 );
-               exit( 1 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -61,9 +82,16 @@ 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
                Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
                  (long) nelem, (long) size, 0 );
-               exit( 1 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -77,8 +105,14 @@ 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
                Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
-               exit( 1 );
+#endif
+               assert( 0 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -89,3 +123,5 @@ ch_free( void *ptr )
 {
        ber_memfree( ptr );
 }
+
+#endif