A few changes to the handling of operational attributes.

[openldap] / servers / slurpd / ch_malloc.c

diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c
index 0adcb7bddff979a28090779657f3c234eca43b95..5161742751bd8c29a16c438a894ea408e9a08159 100644 (file)
--- a/servers/slurpd/ch_malloc.c
+++ b/servers/slurpd/ch_malloc.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
@@ -10,6 +15,8 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
+#define CH_FREE 1
+
 /*
  * ch_malloc.c - malloc() and friends, with check for NULL return.
  */
@@ -24,6 +31,7 @@
 #include "../slapd/slap.h"
 
 
+#ifndef CSRIMALLOC
 
 /*
  * Just like malloc, except we check the returned value and exit
@@ -36,10 +44,10 @@ ch_malloc(
 {
        void    *new;
 
-       if ( (new = (void *) malloc( size )) == NULL ) {
+       if ( (new = (void *) ber_memalloc( size )) == NULL ) {
                fprintf( stderr, "malloc of %lu bytes failed\n",
                        (long) size );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -64,10 +72,14 @@ ch_realloc(
                return( ch_malloc( size ) );
        }
 
-       if ( (new = (void *) realloc( block, size )) == NULL ) {
+       if ( size == 0 ) {
+               ch_free( block );
+       }
+
+       if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
                fprintf( stderr, "realloc of %lu bytes failed\n",
                        (long) size );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -88,10 +100,10 @@ ch_calloc(
 {
        void    *new;
 
-       if ( (new = (void *) calloc( nelem, size )) == NULL ) {
+       if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
                fprintf( stderr, "calloc of %lu elems of %lu bytes failed\n",
                    (long) nelem, (long) size );
-               exit( 1 );
+               exit( EXIT_FAILURE );
        }
 
        return( new );
@@ -107,8 +119,9 @@ ch_free(
 )
 {
     if ( p != NULL ) {
-       free( p );
+               ber_memfree( p );
     }
     return;
 }
-       
+
+#endif