diff options
| author | Jan Beulich <jbeulich@novell.com> | 2019-06-25 12:01:50 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2019-06-25 12:01:50 +0200 |
| commit | ab9f654ca3f1222f63533aabfffc223ae1fc69dc (patch) | |
| tree | 83cf0e561695b29b44a0a29513cc8d0ec347c61f /bfd | |
| parent | 3e50a591d9f0c0b22bbf93d09eef7d2286f3716c (diff) | |
| download | gdb-ab9f654ca3f1222f63533aabfffc223ae1fc69dc.zip gdb-ab9f654ca3f1222f63533aabfffc223ae1fc69dc.tar.gz gdb-ab9f654ca3f1222f63533aabfffc223ae1fc69dc.tar.bz2 | |
bfd/elf-properties: avoid shadowing a C library symbol
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
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf-properties.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d8cbef1..0783242 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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 diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c index a297c9c..198eece 100644 --- a/bfd/elf-properties.c +++ b/bfd/elf-properties.c @@ -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; } |