espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 00:59:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

objcopy: Avoid shadowing optarg.

Browse Source 
In commit 7173b38a442c007a554ea200817a0eadce89c87b I used optarg as the
name for a function parameter, shadowing the global of that name.  This
commit changes the function parameter to be called arg.

binutils/ChangeLog:

	* objcopy.c (init_section_add): Rename optarg to arg in order to
	avoid shadowing a global variable.
This commit is contained in:
Andrew Burgess
2015-02-26 17:17:46 +00:00
parent 532f44ed67
commit 06b73f4199
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2015-02-26 Andrew Burgess <andrew.burgess@embecosm.com>
* objcopy.c (init_section_add): Rename optarg to arg in order to
avoid shadowing a global variable.
2015-02-26 Nick Clifton <nickc@redhat.com> 2015-02-26 Nick Clifton <nickc@redhat.com>
PR binutils/17512 PR binutils/17512

8
binutils/objcopy.c
View File

@ -3547,25 +3547,25 @@ convert_efi_target (char *efi)
} }
/* Allocate and return a pointer to a struct section_add, initializing the /* Allocate and return a pointer to a struct section_add, initializing the
structure using OPTARG, a string in the format "sectionname=filename". structure using ARG, a string in the format "sectionname=filename".
The returned structure will have its next pointer set to NEXT. The The returned structure will have its next pointer set to NEXT. The
OPTION field is the name of the command line option currently being OPTION field is the name of the command line option currently being
parsed, and is only used if an error needs to be reported. */ parsed, and is only used if an error needs to be reported. */
static struct section_add * static struct section_add *
init_section_add (const char *optarg, init_section_add (const char *arg,
struct section_add *next, struct section_add *next,
const char *option) const char *option)
{ {
struct section_add *pa; struct section_add *pa;
const char *s; const char *s;
s = strchr (optarg, '='); s = strchr (arg, '=');
if (s == NULL) if (s == NULL)
fatal (_("bad format for %s"), option); fatal (_("bad format for %s"), option);
pa = (struct section_add *) xmalloc (sizeof (struct section_add)); pa = (struct section_add *) xmalloc (sizeof (struct section_add));
pa->name = xstrndup (optarg, s - optarg); pa->name = xstrndup (arg, s - arg);
pa->filename = s + 1; pa->filename = s + 1;
pa->next = next; pa->next = next;
pa->contents = NULL; pa->contents = NULL;