From: Howard Chu <hyc@openldap.org>
Date: Fri, 6 Nov 2009 01:37:09 +0000 (+0000)
Subject: Minor cleanup in strval2str
X-Git-Tag: ACLCHECK_0~142
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=86d9e86afd11d929b29575ee2993b3faa6724772;p=openldap

Minor cleanup in strval2str
---

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 306063d53c..fc52503400 100644
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -2131,16 +2131,15 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len )
 		
 		/*
 		 * The length was checked in strval2strlen();
-		 * LDAP_UTF8_CHARLEN() should suffice
 		 */
-		cl = LDAP_UTF8_CHARLEN2( &val->bv_val[ s ], cl );
-		assert( cl > 0 );
-		
+		cl = LDAP_UTF8_CHARLEN( &val->bv_val[ s ] );
+
 		/* 
 		 * there might be some chars we want to escape in form
 		 * of a couple of hexdigits for optimization purposes
 		 */
-		if ( ( cl > 1 && !LDAP_DN_IS_PRETTY( flags ) ) 
+		if ( cl > 1 ) {
+ 			if ( !LDAP_DN_IS_PRETTY( flags )
 #ifdef PRETTY_ESCAPE
 #if 0
 				|| LDAP_DN_WILLESCAPE_HEX( flags, val->bv_val[ s ] ) 
@@ -2155,16 +2154,17 @@ strval2str( struct berval *val, char *str, unsigned flags, ber_len_t *len )
 
 #endif /* ! PRETTY_ESCAPE */
 				) {
-			for ( ; cl--; ) {
-				str[ d++ ] = '\\';
-				byte2hexpair( &val->bv_val[ s ], &str[ d ] );
-				s++;
-				d += 2;
-			}
+				for ( ; cl--; ) {
+					str[ d++ ] = '\\';
+					byte2hexpair( &val->bv_val[ s ], &str[ d ] );
+					s++;
+					d += 2;
+				}
 
-		} else if ( cl > 1 ) {
-			for ( ; cl--; ) {
-				str[ d++ ] = val->bv_val[ s++ ];
+			} else {
+				for ( ; cl--; ) {
+					str[ d++ ] = val->bv_val[ s++ ];
+				}
 			}
 
 		} else {