fix warnings after previous commit

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 177a78c78b3c8d1dd969dd2e763dfe85c781617e..67df3adf7fc6dbd9f09c8f3565f404fbb1d9931b 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -716,7 +716,7 @@ ldap_dump_requests_and_responses( LDAP *ld )
                Debug( LDAP_DEBUG_TRACE, "   outstanding referrals %d, parent count %d\n",
                        lr->lr_outrefcnt, lr->lr_parentcnt, 0 );
        }
-       Debug( LDAP_DEBUG_TRACE, "  ld %p request count %d (abandoned %d)\n",
+       Debug( LDAP_DEBUG_TRACE, "  ld %p request count %d (abandoned %lu)\n",
                (void *)ld, i, ld->ld_nabandoned );
        Debug( LDAP_DEBUG_TRACE, "** ld %p Response Queue:\n", (void *)ld, 0, 0 );
        if ( ( lm = ld->ld_responses ) == NULL ) {

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 380d37e21325dbe38f8dca05e4f6980d3f0512fd..03bd73601dfe23ae46bff3a6a1e02b3754febb14 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -1322,8 +1322,6 @@ ldap_abandoned( LDAP *ld, ber_int_t msgid, int *idxp )
 static int
 ldap_mark_abandoned( LDAP *ld, ber_int_t msgid, int idx )
 {
-       int             i;
-
 #ifdef LDAP_R_COMPILE
        LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
 #endif
@@ -1333,12 +1331,6 @@ ldap_mark_abandoned( LDAP *ld, ber_int_t msgid, int idx )
        assert( idx < ld->ld_nabandoned );
        assert( ld->ld_abandoned[ idx ] == msgid );
 
-#if 0
-       fprintf( stderr, "--> ldap_mark_abandoned %p %p %d %d:\n", (void *)&i, (void *)ld, msgid, idx );
-       for ( i = 0; i < ld->ld_nabandoned; i++ ) {
-               fprintf( stderr, "\t%p %p %d\n", (void *)&i, (void *)ld, ld->ld_abandoned[ i ] );
-       }
-#endif
-
-       return lutil_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned, msgid, idx );
+       return lutil_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned,
+               msgid, idx );
 }