X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=70312bd4e228a887ea60b17bf6c5bc3e97fbc371;hb=ef7f5f5e32e6e0f129aee7fa1626017a7dadcb48;hp=92d6a7da26821d3f43b0bbe2b0cc460094e4b1cc;hpb=be28bf247e67c727dc58b38692f157a90fb75844;p=openldap
diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 92d6a7da26..70312bd4e2 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,8 +1,27 @@
/* ch_malloc.c - malloc routines that test returns from malloc and friends */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#define CH_FREE 1
@@ -33,13 +52,8 @@ ch_malloc(
void *new;
if ( (new = (void *) ber_memalloc_x( size, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "ch_malloc: allocation of %lu bytes failed\n", (long)size, 0,0 );
-#else
Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
(long) size, 0, 0 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -61,21 +75,17 @@ ch_realloc(
if( size == 0 ) {
ch_free( block );
+ return NULL;
}
- ctx = sl_context( block );
+ ctx = slap_sl_context( block );
if ( ctx ) {
- return sl_realloc( block, size, ctx );
+ return slap_sl_realloc( block, size, ctx );
}
if ( (new = (void *) ber_memrealloc_x( block, size, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "ch_realloc: reallocation of %lu bytes failed\n", (long)size, 0,0 );
-#else
Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
(long) size, 0, 0 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -92,14 +102,8 @@ ch_calloc(
void *new;
if ( (new = (void *) ber_memcalloc_x( nelem, size, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
- (long)nelem, (long)size, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
(long) nelem, (long) size, 0 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -115,12 +119,7 @@ ch_strdup(
char *new;
if ( (new = ber_strdup_x( string, NULL )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "chr_strdup: duplication of \"%s\" failed\n", string, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
-#endif
assert( 0 );
exit( EXIT_FAILURE );
}
@@ -133,9 +132,9 @@ ch_free( void *ptr )
{
void *ctx;
- ctx = sl_context( ptr );
+ ctx = slap_sl_context( ptr );
if (ctx) {
- sl_free( ptr, ctx );
+ slap_sl_free( ptr, ctx );
} else {
ber_memfree_x( ptr, NULL );
}