From 2660518c5d924b2b6377a870e64eab92ed059fb0 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Thu, 10 Jan 2008 18:34:40 +0000 Subject: [PATCH] ldap_int_bisect_find(): Silence harmless "may be used uninitialized" warning --- libraries/libldap/abandon.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c index a4fefb8953..8f2fb34194 100644 --- a/libraries/libldap/abandon.c +++ b/libraries/libldap/abandon.c @@ -355,8 +355,7 @@ ldap_int_bisect_find( ber_int_t *v, ber_len_t n, ber_int_t id, int *idxp ) begin = 0; end = n - 1; - if ( n > 0 ) { - if ( id < v[ begin ] ) { + if ( n <= 0 || id < v[ begin ] ) { *idxp = 0; } else if ( id > v[ end ] ) { @@ -366,7 +365,7 @@ ldap_int_bisect_find( ber_int_t *v, ber_len_t n, ber_int_t id, int *idxp ) int pos; ber_int_t curid; - while ( end >= begin ) { + do { pos = (begin + end)/2; curid = v[ pos ]; @@ -374,25 +373,18 @@ ldap_int_bisect_find( ber_int_t *v, ber_len_t n, ber_int_t id, int *idxp ) end = pos - 1; } else if ( id > curid ) { - begin = pos + 1; + begin = ++pos; } else { /* already abandoned? */ - *idxp = pos; rc = 1; break; } - } + } while ( end >= begin ); - if ( rc == 0 ) { - *idxp = pos + ( id > curid ? 1 : 0 ); - } + *idxp = pos; } - } else { - *idxp = 0; - } - return rc; } -- 2.39.5