aboutsummaryrefslogtreecommitdiff
path: root/bfd/ihex.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2016-09-30 13:00:18 +0930
committerAlan Modra <amodra@gmail.com>2016-09-30 15:17:44 +0930
commit4eca02287cf48e60ee89338ddd35f8d0d8257a51 (patch)
tree8ca78e581fa1260b8a1073e7e1a92d46e8bfabf6 /bfd/ihex.c
parent4519d071387f374932616b588ddb4ec8cabe2a52 (diff)
downloadfsf-binutils-gdb-4eca02287cf48e60ee89338ddd35f8d0d8257a51.zip
fsf-binutils-gdb-4eca02287cf48e60ee89338ddd35f8d0d8257a51.tar.gz
fsf-binutils-gdb-4eca02287cf48e60ee89338ddd35f8d0d8257a51.tar.bz2
Remove syntactic sugar
Now that _bfd_error_handler is not a function pointer. * aout-adobe.c: Replace (*_bfd_error_handler) (...) with _bfd_error_handler (...) throughout. * aout-cris.c, * aoutx.h, * archive.c, * bfd.c, * binary.c, * cache.c, * coff-alpha.c, * coff-arm.c, * coff-h8300.c, * coff-i860.c, * coff-mcore.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c, * coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c, * coffswap.h, * cpu-arm.c, * cpu-m68k.c, * cpu-sh.c, * dwarf2.c, * ecoff.c, * elf-eh-frame.c, * elf-m10300.c, * elf.c, * elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c, * elf32-cris.c, * elf32-crx.c, * elf32-dlx.c, * elf32-frv.c, * elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-lm32.c, * elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc1x.c, * elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-s390.c, * elf32-score.c, * elf32-score7.c, * elf32-sh.c, * elf32-sh64.c, * elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-xtensa.c, * elf64-alpha.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c, * elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c, * elf64-x86-64.c, * elfcode.h, * elfcore.h, * elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * elfxx-mips.c, * elfxx-sparc.c, * elfxx-tilegx.c, * hpux-core.c, * i386linux.c, * ieee.c, * ihex.c, * libbfd.c, * linker.c, * m68klinux.c, * mach-o.c, * merge.c, * mmo.c, * oasys.c, * osf-core.c, * pdp11.c, * pe-mips.c, * peXXigen.c, * pef.c, * plugin.c, * reloc.c, * rs6000-core.c, * sco5-core.c, * som.c, * sparclinux.c, * srec.c, * stabs.c, * syms.c, * vms-alpha.c, * vms-lib.c, * vms-misc.c, * xcofflink.c: Likewise.
Diffstat (limited to 'bfd/ihex.c')
-rw-r--r--bfd/ihex.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/bfd/ihex.c b/bfd/ihex.c
index 27e197d..636632f 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -225,7 +225,7 @@ ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
buf[0] = c;
buf[1] = '\0';
}
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%d: unexpected character `%s' in Intel Hex file"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
@@ -332,7 +332,7 @@ ihex_scan (bfd *abfd)
chksum += HEX2 (buf + 2 * i);
if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
abfd, lineno,
(- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
@@ -387,7 +387,7 @@ ihex_scan (bfd *abfd)
/* An extended address record. */
if (len != 2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -404,7 +404,7 @@ ihex_scan (bfd *abfd)
/* An extended start address record. */
if (len != 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -421,7 +421,7 @@ ihex_scan (bfd *abfd)
/* An extended linear address record. */
if (len != 2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended linear address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -438,7 +438,7 @@ ihex_scan (bfd *abfd)
/* An extended linear start address record. */
if (len != 2 && len != 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: bad extended linear start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@ -455,7 +455,7 @@ ihex_scan (bfd *abfd)
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
abfd, lineno, type);
bfd_set_error (bfd_error_bad_value);
@@ -574,7 +574,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
/* We should only see type 0 records here. */
if (type != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: internal error in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
@@ -608,7 +608,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
if ((bfd_size_type) (p - contents) < section->size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad section length in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
@@ -821,7 +821,7 @@ ihex_write_object_contents (bfd *abfd)
char buf[20];
sprintf_vma (buf, where);
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%s: address 0x%s out of range for Intel Hex file"),
bfd_get_filename (abfd), buf);
bfd_set_error (bfd_error_bad_value);