From 4eca02287cf48e60ee89338ddd35f8d0d8257a51 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 30 Sep 2016 13:00:18 +0930 Subject: 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. --- bfd/coff-ppc.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'bfd/coff-ppc.c') diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c index a931f6a..6c025b0 100644 --- a/bfd/coff-ppc.c +++ b/bfd/coff-ppc.c @@ -844,7 +844,7 @@ ppc_record_toc_entry (bfd *abfd, /* The size must fit in a 16-bit displacement. */ if (global_toc_size > 65535) { - (*_bfd_error_handler) (_("TOC overflow")); + _bfd_error_handler (_("TOC overflow")); bfd_set_error (bfd_error_file_too_big); return FALSE; } @@ -862,7 +862,7 @@ ppc_record_toc_entry (bfd *abfd, /* The size must fit in a 16-bit displacement. */ if (global_toc_size >= 65535) { - (*_bfd_error_handler) (_("TOC overflow")); + _bfd_error_handler (_("TOC overflow")); bfd_set_error (bfd_error_file_too_big); return FALSE; } @@ -1037,7 +1037,7 @@ coff_ppc_relocate_section (bfd *output_bfd, switch (r_type) { default: - (*_bfd_error_handler) + _bfd_error_handler (_("%B: unsupported relocation type 0x%02x"), input_bfd, r_type); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -1127,8 +1127,9 @@ coff_ppc_relocate_section (bfd *output_bfd, /* The size must still fit in a 16-bit displacement. */ if ((bfd_vma) our_toc_offset >= 65535) { - (*_bfd_error_handler) - (_("%B: Relocation for %s of %lx exceeds Toc size limit"), + _bfd_error_handler + (_("%B: Relocation for %s of %lx exceeds " + "Toc size limit"), input_bfd, name, (unsigned long) our_toc_offset); bfd_set_error (bfd_error_bad_value); @@ -1180,7 +1181,7 @@ coff_ppc_relocate_section (bfd *output_bfd, if ((r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN && (bfd_vma) our_toc_offset > toc_section->size) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: Relocation exceeds allocated TOC (%lx)"), input_bfd, (unsigned long) toc_section->size); bfd_set_error (bfd_error_bad_value); @@ -1234,7 +1235,7 @@ coff_ppc_relocate_section (bfd *output_bfd, else my_name = h->root.root.root.string; - (*_bfd_error_handler) + _bfd_error_handler (_("Warning: unsupported reloc %s \n" "sym %ld (%s), r_vaddr %ld (%lx)"), input_bfd, input_section, howto->name, @@ -1252,7 +1253,7 @@ coff_ppc_relocate_section (bfd *output_bfd, break; my_name = h->root.root.root.string; - (*_bfd_error_handler) + _bfd_error_handler (_("%B: Out of order IMGLUE reloc for %s"), input_bfd, my_name); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -1759,9 +1760,9 @@ ppc_coff_rtype2howto (arelent *relent, struct internal_reloc *internal) howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16; break; default: - (*_bfd_error_handler) (_("warning: unsupported reloc %s [%d] used -- it may not work"), - ppc_coff_howto_table[r_type].name, - r_type); + _bfd_error_handler + (_("warning: unsupported reloc %s [%d] used -- it may not work"), + ppc_coff_howto_table[r_type].name, r_type); howto = ppc_coff_howto_table + r_type; break; } @@ -1830,9 +1831,9 @@ coff_ppc_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED, howto = ppc_coff_howto_table + r_type; break; default: - (*_bfd_error_handler) (_("warning: unsupported reloc %s [%d] used -- it may not work"), - ppc_coff_howto_table[r_type].name, - r_type); + _bfd_error_handler + (_("warning: unsupported reloc %s [%d] used -- it may not work"), + ppc_coff_howto_table[r_type].name, r_type); howto = ppc_coff_howto_table + r_type; break; } -- cgit v1.1