Fix modlist bug in last commit

[openldap] / servers / slurpd / ch_malloc.c

diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c
index 22b83b9f4dbe489d611e2094a4d3f467abc4e3f8..9f119825fa8cd0774c119c79d320de6e826b65c8 100644 (file)
--- a/servers/slurpd/ch_malloc.c
+++ b/servers/slurpd/ch_malloc.c
@@ -17,8 +17,10 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/stdlib.h>
+#include <ac/socket.h>
+
 #include "../slapd/slap.h"
 
 
@@ -27,15 +29,16 @@
  * Just like malloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_malloc(
-    unsigned long      size
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) malloc( size )) == NULL ) {
-               fprintf( stderr, "malloc of %d bytes failed\n", size );
+       if ( (new = (void *) ber_memalloc( size )) == NULL ) {
+               fprintf( stderr, "malloc of %lu bytes failed\n",
+                       (long) size );
                exit( 1 );
        }
 
@@ -49,20 +52,25 @@ ch_malloc(
  * Just like realloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_realloc(
-    char               *block,
-    unsigned long      size
+    void               *block,
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new;
 
        if ( block == NULL ) {
                return( ch_malloc( size ) );
        }
 
-       if ( (new = (char *) realloc( block, size )) == NULL ) {
-               fprintf( stderr, "realloc of %d bytes failed\n", size );
+       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 );
        }
 
@@ -76,17 +84,17 @@ ch_realloc(
  * Just like calloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_calloc(
-    unsigned long      nelem,
-    unsigned long      size
+    ber_len_t  nelem,
+    ber_len_t  size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) calloc( nelem, size )) == NULL ) {
-               fprintf( stderr, "calloc of %d elems of %d bytes failed\n",
-                   nelem, size );
+       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 );
        }
 
@@ -99,12 +107,12 @@ ch_calloc(
  */
 void
 ch_free(
-    char *p
+    void *p
 )
 {
     if ( p != NULL ) {
-       free( p );
+               ber_memfree( p );
     }
     return;
 }
-       
+