From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 13 Oct 2008 08:44:54 +0000 (+0000)
Subject: Warning cleanup: signed meets unsigned. ber_flatten2() returns -1 on
X-Git-Tag: ACLCHECK_0~1258
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1c85cf3c88f1e3a904b3072f4ef12633af045962;p=openldap

Warning cleanup: signed meets unsigned. ber_flatten2() returns -1 on
error, not LBER_ERROR.
---

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 8f2fb34194..bd9ebb3818 100644
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -447,8 +447,7 @@ int
 ldap_int_bisect_delete( ber_int_t **vp, ber_len_t *np, int id, int idx )
 {
 	ber_int_t	*v;
-	ber_len_t	n;
-	int		i;
+	ber_len_t	i, n;
 
 	assert( vp != NULL );
 	assert( np != NULL );
diff --git a/libraries/libldap/ldap_sync.c b/libraries/libldap/ldap_sync.c
index 6e7cd48084..da699ff3ee 100644
--- a/libraries/libldap/ldap_sync.c
+++ b/libraries/libldap/ldap_sync.c
@@ -691,7 +691,7 @@ ldap_sync_init( ldap_sync_t *ls, int mode )
 		rc ? "!!! " : "",
 		rc );
 #endif /* LDAP_SYNC_TRACE */
-	if ( rc == LBER_ERROR ) {
+	if ( rc < 0 ) {
 		rc = LDAP_OTHER;
                 goto done;
         }
diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 8030411886..e6b695a644 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1099,7 +1099,7 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
 			/* See if we've already requested this DN with this conn */
 			LDAPRequest *lp;
 			int looped = 0;
-			int len = srv->lud_dn ? strlen( srv->lud_dn ) : 0;
+			ber_len_t len = srv->lud_dn ? strlen( srv->lud_dn ) : 0;
 			for ( lp = origreq; lp; ) {
 				if ( lp->lr_conn == lc
 					&& len == lp->lr_dn.bv_len
@@ -1358,7 +1358,7 @@ ldap_chase_referrals( LDAP *ld,
 		if (( lc = find_connection( ld, srv, 1 )) != NULL ) {
 			LDAPRequest *lp;
 			int looped = 0;
-			int len = srv->lud_dn ? strlen( srv->lud_dn ) : 0;
+			ber_len_t len = srv->lud_dn ? strlen( srv->lud_dn ) : 0;
 			for ( lp = lr; lp; lp = lp->lr_parent ) {
 				if ( lp->lr_conn == lc
 					&& len == lp->lr_dn.bv_len )