+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
/*
* Copyright (c) 1996 Regents of the University of Michigan.
* All rights reserved.
* is provided ``as is'' without express or implied warranty.
*/
+#define CH_FREE 1
+
/*
* ch_malloc.c - malloc() and friends, with check for NULL return.
*/
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
#include <ac/socket.h>
#include "../slapd/slap.h"
+#ifndef CSRIMALLOC
/*
* Just like malloc, except we check the returned value and exit
*/
void *
ch_malloc(
- unsigned long size
+ ber_len_t size
)
{
void *new;
- if ( (new = (void *) malloc( size )) == NULL ) {
- fprintf( stderr, "malloc of %lu bytes failed\n", size );
- exit( 1 );
+ if ( (new = (void *) ber_memalloc( size )) == NULL ) {
+ fprintf( stderr, "malloc of %lu bytes failed\n",
+ (long) size );
+ exit( EXIT_FAILURE );
}
return( new );
void *
ch_realloc(
void *block,
- unsigned long size
+ ber_len_t size
)
{
void *new;
return( ch_malloc( size ) );
}
- if ( (new = (void *) realloc( block, size )) == NULL ) {
- fprintf( stderr, "realloc of %lu bytes failed\n", size );
- exit( 1 );
+ 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( EXIT_FAILURE );
}
return( new );
*/
void *
ch_calloc(
- unsigned long nelem,
- unsigned long size
+ ber_len_t nelem,
+ ber_len_t size
)
{
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",
- nelem, size );
- exit( 1 );
+ (long) nelem, (long) size );
+ exit( EXIT_FAILURE );
}
return( new );
}
+/*
+ * Just like strdup, except we check the returned value and exit
+ * if anything goes wrong.
+ */
+char *
+ch_strdup(
+ const char *string
+)
+{
+ char *new;
+
+ if ( (new = ber_strdup( string )) == NULL ) {
+ fprintf( stderr, "ch_strdup: duplication of \"%s\" failed\n",
+ string );
+ exit( EXIT_FAILURE );
+ }
+
+ return( new );
+}
/*
* Just like free, except we check to see if p is null.
)
{
if ( p != NULL ) {
- free( p );
+ ber_memfree( p );
}
return;
}
-
+
+#endif