Use %A and %B in more error messages

[deliverable/binutils-gdb.git] / bfd / peXXigen.c

diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index eb9c879492491b274985072712e27e3385b061c0..38571cc1051d8a46f61684e5f452994cadc1fb18 100644 (file)
--- 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;
        }