OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This patch removes the use of the "register" keyword from the bsearch() and bsearch_r() functions supplied by libiberty. The register keyword is deprecated in C++17. 

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.
This commit is contained in:
Nick Clifton 2020-06-26 10:04:41 +01:00
parent d61ffe1244
commit 87fce92c5c
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libiberty.h
View File

@ -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

12
libiberty/bsearch.c
View File

@ -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;

12
libiberty/bsearch_r.c
View File

@ -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;