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/xcofflink.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'bfd/xcofflink.c') diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c index d3653e3ba5..20e9b8c347 100644 --- a/bfd/xcofflink.c +++ b/bfd/xcofflink.c @@ -828,7 +828,7 @@ xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info) output file. */ if (info->output_bfd->xvec != abfd->xvec) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: XCOFF shared object when not producing XCOFF output"), bfd_get_filename (abfd)); bfd_set_error (bfd_error_invalid_operation); @@ -849,7 +849,7 @@ xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info) lsec = bfd_get_section_by_name (abfd, ".loader"); if (lsec == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%s: dynamic object with no .loader section"), bfd_get_filename (abfd)); bfd_set_error (bfd_error_no_symbols); @@ -1408,7 +1408,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) enclosing = xcoff_section_data (abfd, csect)->enclosing; if (enclosing == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: `%s' has line numbers but no enclosing section"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -1460,7 +1460,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) /* Pick up the csect auxiliary information. */ if (sym.n_numaux == 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: class %d symbol `%s' has no aux entries"), abfd, sym.n_sclass, name); bfd_set_error (bfd_error_bad_value); @@ -1482,7 +1482,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) switch (smtyp) { default: - (*_bfd_error_handler) + _bfd_error_handler (_("%B: symbol `%s' has unrecognized csect type %d"), abfd, name, smtyp); bfd_set_error (bfd_error_bad_value); @@ -1494,7 +1494,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) || sym.n_scnum != N_UNDEF || aux.x_csect.x_scnlen.l != 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"), abfd, name, sym.n_sclass, sym.n_scnum, aux.x_csect.x_scnlen.l); @@ -1523,7 +1523,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) if (sym.n_sclass != C_HIDEXT || aux.x_csect.x_scnlen.l != 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: XMC_TC0 symbol `%s' is class %d scnlen %d"), abfd, name, sym.n_sclass, aux.x_csect.x_scnlen.l); bfd_set_error (bfd_error_bad_value); @@ -1669,7 +1669,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) || ((bfd_vma) sym.n_value + aux.x_csect.x_scnlen.l > enclosing->vma + enclosing->size))) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: csect `%s' not in enclosing section"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -1776,7 +1776,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) } if (bad) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: misplaced XTY_LD `%s'"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -2096,7 +2096,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) { if (*rel_csect == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: reloc %s:%d not in csect"), abfd, o->name, i); bfd_set_error (bfd_error_bad_value); @@ -3187,7 +3187,7 @@ bfd_xcoff_link_count_reloc (bfd *output_bfd, FALSE)); if (h == NULL) { - (*_bfd_error_handler) (_("%s: no such symbol"), name); + _bfd_error_handler (_("%s: no such symbol"), name); bfd_set_error (bfd_error_no_symbols); return FALSE; } @@ -3291,7 +3291,7 @@ xcoff_build_ldsym (struct xcoff_loader_info *ldinfo, if ((h->flags & XCOFF_EXPORT) != 0 && (h->flags & XCOFF_WAS_UNDEFINED) != 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("warning: attempt to export undefined symbol `%s'"), h->root.root.string); return TRUE; @@ -3670,7 +3670,7 @@ bfd_xcoff_size_dynamic_sections (bfd *output_bfd, "__rtinit", FALSE, FALSE, TRUE); if (hsym == NULL) { - (*_bfd_error_handler) + _bfd_error_handler (_("error: undefined symbol __rtinit")); return FALSE; } @@ -4049,7 +4049,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, ldrel.l_symndx = 2; else { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: loader reloc in unrecognized section `%s'"), reference_bfd, secname); bfd_set_error (bfd_error_nonrepresentable_section); @@ -4060,7 +4060,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, { if (h->ldindx < 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: `%s' in loader reloc but not loader sym"), reference_bfd, h->root.root.string); bfd_set_error (bfd_error_bad_value); @@ -4076,7 +4076,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, if (xcoff_hash_table (flinfo->info)->textro && strcmp (output_section->name, ".text") == 0) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: loader reloc in read-only section %A"), reference_bfd, output_section); bfd_set_error (bfd_error_invalid_operation); @@ -5100,7 +5100,7 @@ xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *flinfo) /* Make sure that the start of the TOC is also within range. */ if (best_address > toc_start + 0x8000) { - (*_bfd_error_handler) + _bfd_error_handler (_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc " "when compiling"), (unsigned long) (toc_end - toc_start)); -- cgit v1.2.3