From dae82561a286618acf097ad9894eafba98377f66 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 13 Apr 2017 13:20:15 +0930
Subject: Use %A and %B in more error messages

	* aoutx.h: Use %B and %A in error messages throughout file.
	* aout-cris.c: Likewise.
	* archive.c: Likewise.
	* binary.c: Likewise.
	* coff-rs6000.c: Likewise.
	* coff-tic4x.c: Likewise.
	* coffcode.h: Likewise.
	* coffgen.c: Likewise.
	* cofflink.c: Likewise.
	* coffswap.h: Likewise.
	* cpu-arm.c: Likewise.
	* elf-eh-frame.c: Likewise.
	* elf-m10300.c: Likewise.
	* elf.c: Likewise.
	* elf32-arc.c: Likewise.
	* elf32-arm.c: Likewise.
	* elf32-bfin.c: Likewise.
	* elf32-frv.c: Likewise.
	* elf32-iq2000.c: Likewise.
	* elf32-m32c.c: Likewise.
	* elf32-microblaze.c: Likewise.
	* elf32-nds32.c: Likewise.
	* elf32-rl78.c: Likewise.
	* elf32-rx.c: Likewise.
	* elf32-score.c: Likewise.
	* elf32-score7.c: Likewise.
	* elf32-sh64.c: Likewise.
	* elf32-v850.c: Likewise.
	* elf32-vax.c: Likewise.
	* elf32-visium.c: Likewise.
	* elf64-ia64-vms.c: Likewise.
	* elf64-mmix.c: Likewise.
	* elf64-sh64.c: Likewise.
	* elfcode.h: Likewise.
	* elfnn-aarch64.c: Likewise.
	* elfnn-ia64.c: Likewise.
	* elfxx-mips.c: Likewise.
	* hpux-core.c: Likewise.
	* ieee.c: Likewise.
	* ihex.c: Likewise.
	* linker.c: Likewise.
	* merge.c: Likewise.
	* mmo.c: Likewise.
	* oasys.c: Likewise.
	* pdp11.c: Likewise.
	* peXXigen.c: Likewise.
	* rs6000-core.c: Likewise.
	* vms-alpha.c: Likewise.
	* xcofflink.c: Likewise.
---
 bfd/peXXigen.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'bfd/peXXigen.c')

diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index eb9c879..38571cc 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -1086,9 +1086,8 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out)
       else
 	{
 	  /* xgettext:c-format */
-	  _bfd_error_handler (_("%s: line number overflow: 0x%lx > 0xffff"),
-			      bfd_get_filename (abfd),
-			      scnhdr_int->s_nlnno);
+	  _bfd_error_handler (_("%B: line number overflow: 0x%lx > 0xffff"),
+			      abfd, scnhdr_int->s_nlnno);
 	  bfd_set_error (bfd_error_file_truncated);
 	  H_PUT_16 (abfd, 0xffff, scnhdr_ext->s_nlnno);
 	  ret = 0;
@@ -4220,16 +4219,16 @@ rsrc_process_section (bfd * abfd,
       if (data > dataend)
 	{
 	  /* Corrupted .rsrc section - cannot merge.  */
-	  _bfd_error_handler (_("%s: .rsrc merge failure: corrupt .rsrc section"),
-			      bfd_get_filename (abfd));
+	  _bfd_error_handler (_("%B: .rsrc merge failure: corrupt .rsrc section"),
+			      abfd);
 	  bfd_set_error (bfd_error_file_truncated);
 	  goto end;
 	}
 
       if ((data - p) > rsrc_sizes [num_resource_sets])
 	{
-	  _bfd_error_handler (_("%s: .rsrc merge failure: unexpected .rsrc size"),
-			      bfd_get_filename (abfd));
+	  _bfd_error_handler (_("%B: .rsrc merge failure: unexpected .rsrc size"),
+			      abfd);
 	  bfd_set_error (bfd_error_file_truncated);
 	  goto end;
 	}
-- 
cgit v1.1