X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fbsearch.c;h=ab93b94782284e7a1414aa9b5176a50203965a3c;hb=cd6cfe0f578c4f744ddc9a342243aff6b42f8027;hp=b9a33c65064fc64fd11470b4f58ed504e10da909;hpb=12e17136786afb1775c9dc946cbe41f5e230c24a;p=pdclib.old diff --git a/functions/stdlib/bsearch.c b/functions/stdlib/bsearch.c index b9a33c6..ab93b94 100644 --- a/functions/stdlib/bsearch.c +++ b/functions/stdlib/bsearch.c @@ -1,7 +1,5 @@ /* $Id$ */ -/* Release $Name$ */ - /* bsearch( const void *, const void *, size_t, size_t, int(*)( const void *, const void * ) ) This file is part of the Public Domain C Library (PDCLib). @@ -16,18 +14,19 @@ void * bsearch( const void * key, const void * base, size_t nmemb, size_t size, { const void * pivot; int rc; - int corr; + size_t corr; while ( nmemb ) { /* algorithm needs -1 correction if remaining elements are an even number. */ - corr = ( nmemb % 2 ) - 1; + corr = nmemb % 2; nmemb /= 2; pivot = (const char *)base + (nmemb * size); rc = compar( key, pivot ); if ( rc > 0 ) { base = (const char *)pivot + size; - nmemb += corr; + /* applying correction */ + nmemb -= ( 1 - corr ); } else if ( rc == 0 ) {