X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=libiberty%2Fbsearch.c;fp=libiberty%2Fbsearch.c;h=771d5de7b12aa7c3222fae913ccf22b0fb9fcd5d;hb=6fed43773c9b0ce596dca5686f37ac3fc0fa11c0;hp=b3283f9285fac3793e00a959676bbe9929758b52;hpb=27b11d56b743098deb193d510b337ba22dc52e5c;p=msp430-gcc.git

diff --git a/libiberty/bsearch.c b/libiberty/bsearch.c
index b3283f92..771d5de7 100644
--- a/libiberty/bsearch.c
+++ b/libiberty/bsearch.c
@@ -67,24 +67,21 @@ is respectively less than, matching, or greater than the array member.
  * look at item 3.
  */
 void *
-bsearch(key, base0, nmemb, size, compar)
-	register void *key;
-	void *base0;
-	size_t nmemb;
-	register size_t size;
-	register int (*compar)();
+bsearch (register const void *key, const void *base0,
+         size_t nmemb, register size_t size,
+         register int (*compar)(const void *, const void *))
 {
-	register char *base = base0;
+	register const char *base = (const char *) base0;
 	register int lim, cmp;
-	register void *p;
+	register const void *p;
 
 	for (lim = nmemb; lim != 0; lim >>= 1) {
 		p = base + (lim >> 1) * size;
 		cmp = (*compar)(key, p);
 		if (cmp == 0)
-			return (p);
+			return (void *)p;
 		if (cmp > 0) {	/* key > p: move right */
-			base = (char *)p + size;
+			base = (const char *)p + size;
 			lim--;
 		} /* else move left */
 	}