Relocate regex.h test to near top and die if it fails.

[openldap] / servers / slurpd / ch_malloc.c

diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c
index 7b3ddcd840f486e17585eabfffdaad22960ed1ed..191a7d06c4c382b047cbfeef99ba9feb02a86aa1 100644 (file)
--- a/servers/slurpd/ch_malloc.c
+++ b/servers/slurpd/ch_malloc.c
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/socket.h>
 
 #include "../slapd/slap.h"
@@ -28,15 +29,15 @@
  * Just like malloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_malloc(
     unsigned long      size
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) malloc( size )) == NULL ) {
-               fprintf( stderr, "malloc of %d bytes failed\n", size );
+       if ( (new = (void *) malloc( size )) == NULL ) {
+               fprintf( stderr, "malloc of %lu bytes failed\n", size );
                exit( 1 );
        }
 
@@ -50,20 +51,20 @@ ch_malloc(
  * Just like realloc, except we check the returned value and exit
  * if anything goes wrong.
  */
-char *
+void *
 ch_realloc(
-    char               *block,
+    void               *block,
     unsigned long      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 ( (new = (void *) realloc( block, size )) == NULL ) {
+               fprintf( stderr, "realloc of %lu bytes failed\n", size );
                exit( 1 );
        }
 
@@ -77,16 +78,16 @@ 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
 )
 {
-       char    *new;
+       void    *new;
 
-       if ( (new = (char *) calloc( nelem, size )) == NULL ) {
-               fprintf( stderr, "calloc of %d elems of %d bytes failed\n",
+       if ( (new = (void *) calloc( nelem, size )) == NULL ) {
+               fprintf( stderr, "calloc of %lu elems of %lu bytes failed\n",
                    nelem, size );
                exit( 1 );
        }
@@ -100,7 +101,7 @@ ch_calloc(
  */
 void
 ch_free(
-    char *p
+    void *p
 )
 {
     if ( p != NULL ) {