X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fch_malloc.c;h=c9af173946e0f06c03a56f9692ba91f180de5678;hb=4e4818771c26a4c02808130970f2a5e4c216ef52;hp=e08d7214b6b5ea5cd4e493517a8626f945d495e8;hpb=d531a20f5216c803a7839488e3e33f32b88c5d87;p=openldap

diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index e08d7214b6..c9af173946 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,7 +1,7 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -29,9 +29,8 @@ ch_malloc(
 
 	if ( (new = (void *) ber_memalloc( size )) == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "ch_malloc: allocation of %lu bytes failed\n",
-                       (long)size ));
+		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 );
@@ -61,8 +60,8 @@ ch_realloc(
 
 	if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "ch_realloc: reallocation of %lu bytes failed\n", (long)size ));
+		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 );
@@ -84,9 +83,9 @@ ch_calloc(
 
 	if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "ch_calloc: allocation of %lu elements of %lu bytes faild\n",
-                       (long)nelem, (long)size ));
+		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 );
@@ -107,8 +106,8 @@ ch_strdup(
 
 	if ( (new = ber_strdup( string )) == NULL ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "chr_strdup: duplication of \"%s\" failed\n", string ));
+		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