From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Wed, 1 Sep 2004 16:01:36 +0000 (+0000)
Subject: revert prev commit to normalizers
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~583
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=70fda7725a88f2dd1591bd13058ca3ed52a791a4;p=openldap

revert prev commit to normalizers
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 74319136b9..07fcecb8fc 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1636,7 +1636,7 @@ telephoneNumberNormalize(
 	/* validator should have refused an empty string */
 	assert( val->bv_len );
 
-	q = normalized->bv_val = ch_malloc( val->bv_len + 1 );
+	q = normalized->bv_val = slap_sl_malloc( val->bv_len + 1, ctx );
 
 	for( p = val->bv_val; *p; p++ ) {
 		if ( ! ( ASCII_SPACE( *p ) || *p == '-' )) {
@@ -1977,7 +1977,7 @@ UUIDNormalize(
 	int i;
 	int j;
 	normalized->bv_len = 16;
-	normalized->bv_val = ch_malloc( normalized->bv_len + 1 );
+	normalized->bv_val = slap_sl_malloc( normalized->bv_len + 1, ctx );
 
 	for( i=0, j=0; i<36; i++ ) {
 		unsigned char nibble;
@@ -2045,7 +2045,7 @@ numericStringNormalize(
 
 	assert( val->bv_len );
 
-	normalized->bv_val = ch_malloc( val->bv_len + 1 );
+	normalized->bv_val = slap_sl_malloc( val->bv_len + 1, ctx );
 
 	p = val->bv_val;
 	q = normalized->bv_val;
@@ -2672,7 +2672,7 @@ generalizedTimeNormalize(
 	}
 
 	len = sizeof("YYYYmmddHHMMSSZ")-1 + fraction.bv_len;
-	normalized->bv_val = ch_malloc( len + 1 );
+	normalized->bv_val = slap_sl_malloc( len + 1, ctx );
 	if ( normalized->bv_val == NULL ) {
 		return LBER_ERROR_MEMORY;
 	}