X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=b44579697044bcd91e5c22ed2f1e66649bb34862;hb=63498d1a2199eeca1db4ca7d27e665cbd73cb095;hp=43ec4c9adb08ebd63a0eaec3e9967f9bc3252379;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 43ec4c9adb..b445796970 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,58 +1,80 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/stdlib.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
-char *
+void *
 ch_malloc(
     unsigned long	size
 )
 {
-	char	*new;
+	void	*new;
 
-	if ( (new = (char *) malloc( size )) == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "malloc of %d bytes failed\n", size, 0, 0 );
+	if ( (new = (void *) malloc( size )) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "malloc of %lu bytes failed\n", size, 0, 0 );
 		exit( 1 );
 	}
 
 	return( new );
 }
 
-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 ) {
-		Debug( LDAP_DEBUG_ANY, "realloc of %d bytes failed\n", size, 0, 0 );
+	if ( (new = (void *) realloc( block, size )) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "realloc of %lu bytes failed\n", size, 0, 0 );
 		exit( 1 );
 	}
 
 	return( new );
 }
 
-char *
+void *
 ch_calloc(
     unsigned long	nelem,
     unsigned long	size
 )
 {
-	char	*new;
+	void	*new;
 
-	if ( (new = (char *) calloc( nelem, size )) == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "calloc of %d elems of %d bytes failed\n",
+	if ( (new = (void *) calloc( nelem, size )) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "calloc of %lu elems of %lu bytes failed\n",
 		  nelem, size, 0 );
 		exit( 1 );
 	}
 
 	return( new );
 }
+
+char *
+ch_strdup(
+    const char *string
+)
+{
+	char	*new;
+
+	if ( (new = strdup( string )) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "strdup(%s) failed\n", string, 0, 0 );
+		exit( 1 );
+	}
+
+	return( new );
+}
+