X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=lib%2Fbsearch.c;h=bf86aa66f2b275798ae850e321a1a459d1a6bfab;hb=adebc8817b5c975d598ac379bbdf67a7a5186ade;hp=8b3aae5ae77a20ea4a087e0926f9eeebcdbd33d0;hpb=7347f09a198a045d5f6ea5e9c8fcc1db98e5a854;p=linux-2.6-microblaze.git diff --git a/lib/bsearch.c b/lib/bsearch.c index 8b3aae5ae77a..bf86aa66f2b2 100644 --- a/lib/bsearch.c +++ b/lib/bsearch.c @@ -28,27 +28,9 @@ * the key and elements in the array are of the same type, you can use * the same comparison function for both sort() and bsearch(). */ -void *bsearch(const void *key, const void *base, size_t num, size_t size, - cmp_func_t cmp) +void *bsearch(const void *key, const void *base, size_t num, size_t size, cmp_func_t cmp) { - const char *pivot; - int result; - - while (num > 0) { - pivot = base + (num >> 1) * size; - result = cmp(key, pivot); - - if (result == 0) - return (void *)pivot; - - if (result > 0) { - base = pivot + size; - num--; - } - num >>= 1; - } - - return NULL; + return __inline_bsearch(key, base, num, size, cmp); } EXPORT_SYMBOL(bsearch); NOKPROBE_SYMBOL(bsearch);