Oldish gcc warns about local variables shadowing outer scope ones.
Additionally %lx is not (always) suitable to print the result of
bfd_get_32().
+2020-01-03 Jan Beulich <jbeulich@suse.com>
+
+ * mach-o.c (cpusubtype, bfd_mach_o_header_p): Insert underscore
+ in parameter names.
+ (bfd_mach_o_scan): Insert underscore in two variable names.
+
2020-01-02 Sergey Belyashov <sergey.belyashov@gmail.com>
* Makefile.am: Add z80-elf target support.
2020-01-02 Sergey Belyashov <sergey.belyashov@gmail.com>
* Makefile.am: Add z80-elf target support.
-cpusubtype (unsigned long cputype, unsigned long cpusubtype)
+cpusubtype (unsigned long cpu_type, unsigned long cpu_subtype)
{
static char buffer[128];
buffer[0] = 0;
{
static char buffer[128];
buffer[0] = 0;
- switch (cpusubtype & BFD_MACH_O_CPU_SUBTYPE_MASK)
+ switch (cpu_subtype & BFD_MACH_O_CPU_SUBTYPE_MASK)
sprintf (buffer, _("<unknown mask flags>")); break;
}
sprintf (buffer, _("<unknown mask flags>")); break;
}
- cpusubtype &= ~ BFD_MACH_O_CPU_SUBTYPE_MASK;
+ cpu_subtype &= ~ BFD_MACH_O_CPU_SUBTYPE_MASK;
{
case BFD_MACH_O_CPU_TYPE_X86_64:
case BFD_MACH_O_CPU_TYPE_I386:
{
case BFD_MACH_O_CPU_TYPE_X86_64:
case BFD_MACH_O_CPU_TYPE_I386:
{
case BFD_MACH_O_CPU_SUBTYPE_X86_ALL:
return strcat (buffer, " (X86_ALL)");
{
case BFD_MACH_O_CPU_SUBTYPE_X86_ALL:
return strcat (buffer, " (X86_ALL)");
break;
case BFD_MACH_O_CPU_TYPE_ARM:
break;
case BFD_MACH_O_CPU_TYPE_ARM:
{
case BFD_MACH_O_CPU_SUBTYPE_ARM_ALL:
return strcat (buffer, " (ARM_ALL)");
{
case BFD_MACH_O_CPU_SUBTYPE_ARM_ALL:
return strcat (buffer, " (ARM_ALL)");
break;
case BFD_MACH_O_CPU_TYPE_ARM64:
break;
case BFD_MACH_O_CPU_TYPE_ARM64:
{
case BFD_MACH_O_CPU_SUBTYPE_ARM64_ALL:
return strcat (buffer, " (ARM64_ALL)");
{
case BFD_MACH_O_CPU_SUBTYPE_ARM64_ALL:
return strcat (buffer, " (ARM64_ALL)");
return strcat (buffer, _(" (<unknown>)"));
return buffer;
return strcat (buffer, _(" (<unknown>)"));
return buffer;
bfd_mach_o_data_struct *mdata)
{
unsigned int i;
bfd_mach_o_data_struct *mdata)
{
unsigned int i;
- enum bfd_architecture cputype;
- unsigned long cpusubtype;
+ enum bfd_architecture cpu_type;
+ unsigned long cpu_subtype;
unsigned int hdrsize;
hdrsize = mach_o_wide_p (header) ?
unsigned int hdrsize;
hdrsize = mach_o_wide_p (header) ?
abfd->tdata.mach_o_data = mdata;
bfd_mach_o_convert_architecture (header->cputype, header->cpusubtype,
abfd->tdata.mach_o_data = mdata;
bfd_mach_o_convert_architecture (header->cputype, header->cpusubtype,
- &cputype, &cpusubtype);
- if (cputype == bfd_arch_unknown)
+ &cpu_type, &cpu_subtype);
+ if (cpu_type == bfd_arch_unknown)
{
_bfd_error_handler
/* xgettext:c-format */
{
_bfd_error_handler
/* xgettext:c-format */
- bfd_set_arch_mach (abfd, cputype, cpusubtype);
+ bfd_set_arch_mach (abfd, cpu_type, cpu_subtype);
if (header->ncmds != 0)
{
if (header->ncmds != 0)
{
const bfd_target *
bfd_mach_o_header_p (bfd *abfd,
file_ptr hdr_off,
const bfd_target *
bfd_mach_o_header_p (bfd *abfd,
file_ptr hdr_off,
- bfd_mach_o_filetype filetype,
- bfd_mach_o_cpu_type cputype)
+ bfd_mach_o_filetype file_type,
+ bfd_mach_o_cpu_type cpu_type)
{
bfd_mach_o_header header;
bfd_mach_o_data_struct *mdata;
{
bfd_mach_o_header header;
bfd_mach_o_data_struct *mdata;
/* Check cputype and filetype.
In case of wildcard, do not accept magics that are handled by existing
targets. */
/* Check cputype and filetype.
In case of wildcard, do not accept magics that are handled by existing
targets. */
- if (header.cputype != cputype)
+ if (header.cputype != cpu_type)
- if (header.filetype != filetype)
+ if (header.filetype != file_type)
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->start));
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->start));
- printf (" %08lx", bfd_get_32 (abfd, e->length));
+ printf (" %08lx", (unsigned long)bfd_get_32 (abfd, e->length));
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->personality));
putchar (' ');
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->personality));
putchar (' ');