OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bfd/elf-properties: avoid shadowing a C library symbol

Browse Source 
With my (oldish) gcc/glibc combination I'm seeing

.../bfd/elf-properties.c: In function ‘elf_find_and_remove_property’:
.../bfd/elf-properties.c:244: error: declaration of ‘remove’ shadows a global declaration
/usr/include/stdio.h:157: error: shadowed declaration is here
This commit is contained in:
Jan Beulich 2019-06-25 12:01:50 +02:00 committed by Jan Beulich
parent 3e50a591d9
commit ab9f654ca3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2019-06-25 Jan Beulich <jbeulich@suse.com>
* elf-properties.c (elf_find_and_remove_property): Rename last
parameter. Mention it in comment.
2019-06-24 Ilia Diachkov <ilia.diachkov@optimitech.com>
* elfnn-riscv.c (_bfd_riscv_relax_lui): Delete early exit when

8
bfd/elf-properties.c
View File

@ -236,12 +236,12 @@ elf_merge_gnu_properties (struct bfd_link_info *info, bfd *abfd, bfd *bbfd,
return FALSE;
}
/* Return the property of TYPE on *LISTP and remove it from *LISTP.
Return NULL if not found. */
/* Return the property of TYPE on *LISTP and remove it from *LISTP if RM is
true. Return NULL if not found. */
static elf_property *
elf_find_and_remove_property (elf_property_list **listp,
unsigned int type, bfd_boolean remove)
unsigned int type, bfd_boolean rm)
{
elf_property_list *list;
@ -250,7 +250,7 @@ elf_find_and_remove_property (elf_property_list **listp,
if (type == list->property.pr_type)
{
/* Remove this property. */
if (remove)
if (rm)
*listp = list->next;
return &list->property;
}