This patch removes the use of the "register" keyword from the bsearch() and bsearch_r...

2020-06-25  Nick Clifton  <nickc@redhat.com>

include/
	* libiberty.h (bsearch_r): Remove use of the register keyword from
	the prototype.

libiberty/
	* bsearch.c (bsearch): Remove use of register keyword.
	* bsearch_r.c (bsearch_r): Likewise.

diff --git a/include/libiberty.h b/include/libiberty.h
index 0bb5b81d4acb9732d926c8f7563628b42fbd313d..591e9ac48d44529274817eb123381626b1c777cc 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -643,9 +643,9 @@ extern int pwait (int, int *, int);
 
 /* Like bsearch, but takes and passes on an argument like qsort_r.  */
 
-extern void *bsearch_r (register const void *, const void *,
-                       size_t, register size_t,
-                       register int (*)(const void *, const void *, void *),
+extern void *bsearch_r (const void *, const void *,
+                       size_t, size_t,
+                       int (*)(const void *, const void *, void *),
                        void *);
 
 #if defined(HAVE_DECL_ASPRINTF) && !HAVE_DECL_ASPRINTF

diff --git a/libiberty/bsearch.c b/libiberty/bsearch.c
index 35fad19977c281306c827f1f9f65053a914a58c8..18158b9591b98d23d67d882170f769e3627b129c 100644 (file)
--- a/libiberty/bsearch.c
+++ b/libiberty/bsearch.c
@@ -69,13 +69,13 @@ is respectively less than, matching, or greater than the array member.
  * look at item 3.
  */
 void *
-bsearch (register const void *key, const void *base0,
-         size_t nmemb, register size_t size,
-         register int (*compar)(const void *, const void *))
+bsearch (const void *key, const void *base0,
+         size_t nmemb, size_t size,
+         int (*compar)(const void *, const void *))
 {
-       register const char *base = (const char *) base0;
-       register int lim, cmp;
-       register const void *p;
+       const char *base = (const char *) base0;
+       int lim, cmp;
+       const void *p;
 
        for (lim = nmemb; lim != 0; lim >>= 1) {
                p = base + (lim >> 1) * size;

diff --git a/libiberty/bsearch_r.c b/libiberty/bsearch_r.c
index 79ebae9b0bee3af4694b86451101e4fcd61ae950..2a2ca6f5e2373966e5bac3d0b2f67aa373b69f76 100644 (file)
--- a/libiberty/bsearch_r.c
+++ b/libiberty/bsearch_r.c
@@ -70,14 +70,14 @@ is respectively less than, matching, or greater than the array member.
  * look at item 3.
  */
 void *
-bsearch_r (register const void *key, const void *base0,
-          size_t nmemb, register size_t size,
-          register int (*compar)(const void *, const void *, void *),
+bsearch_r (const void *key, const void *base0,
+          size_t nmemb, size_t size,
+          int (*compar)(const void *, const void *, void *),
           void *arg)
 {
-       register const char *base = (const char *) base0;
-       register int lim, cmp;
-       register const void *p;
+       const char *base = (const char *) base0;
+       int lim, cmp;
+       const void *p;
 
        for (lim = nmemb; lim != 0; lim >>= 1) {
                p = base + (lim >> 1) * size;