From: Julius Enarusai <julius@openldap.org>
Date: Tue, 19 Nov 2002 17:06:17 +0000 (+0000)
Subject: Converted ch_calloc and ch_malloc calls to SLAP_CALLOC and SLAP_MALLOC.
X-Git-Tag: NO_SLAP_OP_BLOCKS~796
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d9e7a7190b5f9e84dc0dba80f5bf1af993190218;p=openldap

Converted ch_calloc and ch_malloc calls to SLAP_CALLOC and SLAP_MALLOC.
---

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index e9b187a734..57a46713a5 100644
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -101,7 +101,17 @@ static char * referral_dn_muck(
 			}
 
 			muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len;
-			muck.bv_val = ch_malloc( muck.bv_len + 1 );
+			muck.bv_val = SLAP_MALLOC( muck.bv_len + 1 );
+			if( muck.bv_val == NULL ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( OPERATION, CRIT, 
+					"referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_ANY,
+					"referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+				return NULL;
+			}
 
 			strncpy( muck.bv_val, ntargetDN.bv_val,
 				ntargetDN.bv_len-nbaseDN.bv_len );
@@ -225,7 +235,17 @@ BerVarray referral_rewrite(
 
 	if( i < 1 ) return NULL;
 
-	refs = ch_malloc( (i+1) * sizeof( struct berval ) );
+	refs = SLAP_MALLOC( (i+1) * sizeof( struct berval ) );
+	if( refs == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, 
+			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+		return NULL;
+	}
 
 	for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) {
 		LDAPURLDesc *url;
@@ -294,7 +314,17 @@ BerVarray get_entry_referrals(
 
 	if( i < 1 ) return NULL;
 
-	refs = ch_malloc( (i + 1) * sizeof(struct berval));
+	refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval));
+	if( refs == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, 
+			"get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+		return NULL;
+	}
 
 	for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
 		unsigned k;
diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index 9d01b9c671..2a839cbf34 100644
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -47,7 +47,7 @@ set_join (BerVarray lset, int op, BerVarray rset)
 		if (lset == NULL || lset->bv_val == NULL) {
 			if (rset == NULL) {
 				if (lset == NULL)
-					return(ch_calloc(1, sizeof(struct berval)));
+					return(SLAP_CALLOC(1, sizeof(struct berval)));
 				return(lset);
 			}
 			slap_set_dispose(lset);
@@ -59,7 +59,7 @@ set_join (BerVarray lset, int op, BerVarray rset)
 		}
 
 		i = slap_set_size(lset) + slap_set_size(rset) + 1;
-		set = ch_calloc(i, sizeof(struct berval));
+		set = SLAP_CALLOC(i, sizeof(struct berval));
 		if (set != NULL) {
 			/* set_chase() depends on this routine to
 			 * keep the first elements of the result
@@ -87,7 +87,7 @@ set_join (BerVarray lset, int op, BerVarray rset)
 
 	if (op == '&') {
 		if (lset == NULL || lset->bv_val == NULL || rset == NULL || rset->bv_val == NULL) {
-			set = ch_calloc(1, sizeof(struct berval));
+			set = SLAP_CALLOC(1, sizeof(struct berval));
 		} else {
 			set = lset;
 			lset = NULL;
@@ -126,7 +126,7 @@ set_chase (SLAP_SET_GATHER gatherer,
 	bv.bv_val = attrstr;
 
 	if (set == NULL)
-		return(ch_calloc(1, sizeof(struct berval)));
+		return(SLAP_CALLOC(1, sizeof(struct berval)));
 
 	if (set->bv_val == NULL)
 		return(set);
@@ -138,7 +138,7 @@ set_chase (SLAP_SET_GATHER gatherer,
 	AC_MEMCPY(attrstr, attr->bv_val, attr->bv_len);
 	attrstr[attr->bv_len] = 0;
 
-	nset = ch_calloc(1, sizeof(struct berval));
+	nset = SLAP_CALLOC(1, sizeof(struct berval));
 	if (nset == NULL) {
 		slap_set_dispose(set);
 		return(NULL);
@@ -287,10 +287,10 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
 			if (c == 0)
 				SF_ERROR(syntax);
 			
-			set = ch_calloc(2, sizeof(struct berval));
+			set = SLAP_CALLOC(2, sizeof(struct berval));
 			if (set == NULL)
 				SF_ERROR(memory);
-			set->bv_val = ch_calloc(len + 1, sizeof(char));
+			set->bv_val = SLAP_CALLOC(len + 1, sizeof(char));
 			if (set->bv_val == NULL)
 				SF_ERROR(memory);
 			AC_MEMCPY(set->bv_val, &filter[-len - 1], len);
@@ -331,7 +331,7 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
 			{
 				if ((SF_TOP() == (void *)'/') || IS_SET(SF_TOP()))
 					SF_ERROR(syntax);
-				set = ch_calloc(2, sizeof(struct berval));
+				set = SLAP_CALLOC(2, sizeof(struct berval));
 				if (set == NULL)
 					SF_ERROR(memory);
 				ber_dupbv( set, this );
@@ -342,7 +342,7 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
 			{
 				if ((SF_TOP() == (void *)'/') || IS_SET(SF_TOP()))
 					SF_ERROR(syntax);
-				set = ch_calloc(2, sizeof(struct berval));
+				set = SLAP_CALLOC(2, sizeof(struct berval));
 				if (set == NULL)
 					SF_ERROR(memory);
 				ber_dupbv( set, user );