Minor cleanup in strval2str

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 306063d53cafe52804ff118c90358e3c75b7a76b..540c2d26723d88365737042cb8498bde7ff16b1d 100644 (file)
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -2131,10 +2131,8 @@ 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