Wrap long lines

Not a comprehensive change, just some split out from fixes made for
the %A and %B changes.

	* coffcode.h: Wrap some overly long _bfd_error_handler args.
	* elf.c: Likewise.
	* elf32-arm.c: Likewise.
	* elf32-i386.c: Likewise.
	* elf32-mep.c: Likewise.
	* elf64-ia64-vms.c: Likewise.
	* elf64-x86-64.c: Likewise.
	* elflink.c: Likewise.
	* elfnn-ia64.c: Likewise.
	* elfxx-mips.c: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f46aaae..f26882f 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,18 @@
 2017-04-13  Alan Modra  <amodra@gmail.com>
 
+       * coffcode.h: Wrap some overly long _bfd_error_handler args.
+       * elf.c: Likewise.
+       * elf32-arm.c: Likewise.
+       * elf32-i386.c: Likewise.
+       * elf32-mep.c: Likewise.
+       * elf64-ia64-vms.c: Likewise.
+       * elf64-x86-64.c: Likewise.
+       * elflink.c: Likewise.
+       * elfnn-ia64.c: Likewise.
+       * elfxx-mips.c: Likewise.
+
+2017-04-13  Alan Modra  <amodra@gmail.com>
+
        * aoutx.h: Use %B and %A in error messages throughout file.
        * aout-cris.c: Likewise.
        * archive.c: Likewise.

diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 2716b50..96a7886 100644 (file)
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -965,7 +965,8 @@ handle_COMDAT (bfd * abfd,
          /* PR 17512 file: 078-11867-0.004  */
          if (symname == NULL)
            {
-             _bfd_error_handler (_("%B: unable to load COMDAT section name"), abfd);
+             _bfd_error_handler (_("%B: unable to load COMDAT section name"),
+                                 abfd);
              break;
            }
 
@@ -1005,7 +1006,8 @@ handle_COMDAT (bfd * abfd,
 
                if (isym.n_sclass == C_STAT && strcmp (name, symname) != 0)
                  /* xgettext:c-format */
-                 _bfd_error_handler (_("%B: warning: COMDAT symbol '%s' does not match section name '%s'"),
+                 _bfd_error_handler (_("%B: warning: COMDAT symbol '%s'"
+                                       " does not match section name '%s'"),
                                      abfd, symname, name);
 
                seen_state = 1;
@@ -1014,7 +1016,8 @@ handle_COMDAT (bfd * abfd,
                if (esym + bfd_coff_symesz (abfd) >= esymend)
                  {
                    /* xgettext:c-format */
-                   _bfd_error_handler (_("%B: warning: No symbol for section '%s' found"),
+                   _bfd_error_handler (_("%B: warning: No symbol for"
+                                         " section '%s' found"),
                                        abfd, symname);
                    break;
                  }
@@ -1239,7 +1242,8 @@ styp_to_sec_flags (bfd *abfd,
             variable as this will allow some .sys files generate by
             other toolchains to be processed.  See bugzilla issue 196.  */
          /* xgettext:c-format */
-         _bfd_error_handler (_("%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"),
+         _bfd_error_handler (_("%B: Warning: Ignoring section flag"
+                               " IMAGE_SCN_MEM_NOT_PAGED in section %s"),
                              abfd, name);
          break;
        case IMAGE_SCN_MEM_EXECUTE:
@@ -2784,7 +2788,8 @@ coff_write_relocs (bfd * abfd, int first_undef)
                      {
                        bfd_set_error (bfd_error_bad_value);
                        /* xgettext:c-format */
-                       _bfd_error_handler (_("%B: reloc against a non-existant symbol index: %ld"),
+                       _bfd_error_handler (_("%B: reloc against a non-existent"
+                                             " symbol index: %ld"),
                                            abfd, n.r_symndx);
                        return FALSE;
                      }

diff --git a/bfd/elf.c b/bfd/elf.c
index 6b5e42b..18b4bbe 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -339,7 +339,8 @@ bfd_elf_string_from_elf_section (bfd *abfd,
        {
          /* PR 17512: file: f057ec89.  */
          /* xgettext:c-format */
-         _bfd_error_handler (_("%B: attempt to load strings from a non-string section (number %d)"),
+         _bfd_error_handler (_("%B: attempt to load strings from"
+                               " a non-string section (number %d)"),
                              abfd, shindex);
          return NULL;
        }
@@ -492,8 +493,8 @@ bfd_elf_get_elf_syms (bfd *ibfd,
       {
        symoffset += (esym - (bfd_byte *) extsym_buf) / extsym_size;
        /* xgettext:c-format */
-       _bfd_error_handler (_("%B symbol number %lu references "
-                             "nonexistent SHT_SYMTAB_SHNDX section"),
+       _bfd_error_handler (_("%B symbol number %lu references"
+                             " nonexistent SHT_SYMTAB_SHNDX section"),
                            ibfd, (unsigned long) symoffset);
        if (alloc_intsym != NULL)
          free (alloc_intsym);
@@ -649,7 +650,8 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
                    {
                      _bfd_error_handler
                        /* xgettext:c-format */
-                       (_("%B: corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size);
+                       (_("%B: corrupt size field in group section"
+                          " header: 0x%lx"), abfd, shdr->sh_size);
                      bfd_set_error (bfd_error_bad_value);
                      -- num_group;
                      continue;
@@ -663,11 +665,13 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
                    {
                      _bfd_error_handler
                        /* xgettext:c-format */
-                       (_("%B: invalid size field in group section header: 0x%lx"), abfd, shdr->sh_size);
+                       (_("%B: invalid size field in group section"
+                          " header: 0x%lx"), abfd, shdr->sh_size);
                      bfd_set_error (bfd_error_bad_value);
                      -- num_group;
-                     /* PR 17510: If the group contents are even partially
-                        corrupt, do not allow any of the contents to be used.  */
+                     /* PR 17510: If the group contents are even
+                        partially corrupt, do not allow any of the
+                        contents to be used.  */
                      memset (shdr->contents, 0, amt);
                      continue;
                    }
@@ -2085,7 +2089,8 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
        {
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B: warning: multiple symbol tables detected - ignoring the table in section %u"),
+           (_("%B: warning: multiple symbol tables detected"
+              " - ignoring the table in section %u"),
             abfd, shindex);
          goto success;
        }
@@ -2168,7 +2173,8 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
        {
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B: warning: multiple dynamic symbol tables detected - ignoring the table in section %u"),
+           (_("%B: warning: multiple dynamic symbol tables detected"
+              " - ignoring the table in section %u"),
             abfd, shindex);
          goto success;
        }
@@ -3769,7 +3775,8 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info)
                      asection *kept;
                      _bfd_error_handler
                        /* xgettext:c-format */
-                       (_("%B: sh_link of section `%A' points to discarded section `%A' of `%B'"),
+                       (_("%B: sh_link of section `%A' points to"
+                          " discarded section `%A' of `%B'"),
                         abfd, d->this_hdr.bfd_section,
                         s, s->owner);
                      /* Point to the kept section if it has the same
@@ -3793,7 +3800,8 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info)
                    {
                      _bfd_error_handler
                        /* xgettext:c-format */
-                       (_("%B: sh_link of section `%A' points to removed section `%A' of `%B'"),
+                       (_("%B: sh_link of section `%A' points to"
+                          " removed section `%A' of `%B'"),
                         abfd, d->this_hdr.bfd_section, s, s->owner);
                      bfd_set_error (bfd_error_bad_value);
                      return FALSE;
@@ -5393,7 +5401,8 @@ assign_file_positions_for_load_sections (bfd *abfd,
               && strcmp (m->sections[0]->name, ".dynamic") != 0)
        {
          _bfd_error_handler
-           (_("%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"),
+           (_("%B: The first section in the PT_DYNAMIC segment"
+              " is not the .dynamic section"),
             abfd);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
@@ -5420,7 +5429,8 @@ assign_file_positions_for_load_sections (bfd *abfd,
                      && p->p_paddr < (bfd_vma) off))
                {
                  _bfd_error_handler
-                   (_("%B: Not enough room for program headers, try linking with -N"),
+                   (_("%B: Not enough room for program headers,"
+                      " try linking with -N"),
                     abfd);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 61cadf7..434649f 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -8620,11 +8620,12 @@ bfd_elf32_arm_stm32l4xx_erratum_scan (bfd *abfd,
                        if (is_not_last_in_it_block)
                          {
                            _bfd_error_handler
-                             /* Note - overlong line used here to allow for translation.  */
                              /* xgettext:c-format */
-                             (_("\
-%B(%A+0x%lx): error: multiple load detected in non-last IT block instruction : STM32L4XX veneer cannot be generated.\n"
-                                "Use gcc option -mrestrict-it to generate only one instruction per IT block.\n"),
+                             (_("%B(%A+0x%lx): error: multiple load detected"
+                                " in non-last IT block instruction :"
+                                " STM32L4XX veneer cannot be generated.\n"
+                                "Use gcc option -mrestrict-it to generate"
+                                " only one instruction per IT block.\n"),
                               abfd, sec, (long) i);
                          }
                        else

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 3e3aa16..7af6863 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1655,7 +1655,8 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
 
       _bfd_error_handler
        /* xgettext:c-format */
-       (_("%B: direct GOT relocation R_386_GOT32X against `%s' without base register can not be used when making a shared object"),
+       (_("%B: direct GOT relocation R_386_GOT32X against `%s' without base"
+          " register can not be used when making a shared object"),
         abfd, name);
       return FALSE;
     }
@@ -4367,7 +4368,9 @@ disallow_got32:
 
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: direct GOT relocation %s against `%s' without base register can not be used when making a shared object"),
+                   (_("%B: direct GOT relocation %s against `%s'"
+                      " without base register can not be used"
+                      " when making a shared object"),
                     input_bfd, howto->name, name);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
@@ -4415,7 +4418,8 @@ disallow_got32:
 
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"),
+                   (_("%B: relocation R_386_GOTOFF against undefined %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd, v, h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
@@ -4427,7 +4431,8 @@ disallow_got32:
                {
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"),
+                   (_("%B: relocation R_386_GOTOFF against protected %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd,
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);

diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c
index 4916444..32305c5 100644 (file)
--- a/bfd/elf32-mep.c
+++ b/bfd/elf32-mep.c
@@ -617,7 +617,8 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       else
        {
          /* xgettext:c-format */
-         _bfd_error_handler (_("%B and %B are for different cores"), last_ibfd, ibfd);
+         _bfd_error_handler (_("%B and %B are for different cores"),
+                             last_ibfd, ibfd);
          bfd_set_error (bfd_error_invalid_target);
          return FALSE;
        }
@@ -635,7 +636,8 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       else
        {
          /* xgettext:c-format */
-         _bfd_error_handler (_("%B and %B are for different configurations"), last_ibfd, ibfd);
+         _bfd_error_handler (_("%B and %B are for different configurations"),
+                             last_ibfd, ibfd);
          bfd_set_error (bfd_error_invalid_target);
          return FALSE;
        }

diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 4d35a5d..5dd83a3 100644 (file)
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -3555,7 +3555,8 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                     shared libraries nor dynamic executables.  */
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
+                   (_("%B: non-pic code with imm relocation against"
+                      " dynamic symbol `%s'"),
                     input_bfd,
                     h ? h->root.root.string
                       : bfd_elf_sym_name (input_bfd, symtab_hdr, sym,

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index dbbdf89..bf10893 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2524,7 +2524,8 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
                                               isym, NULL);
                    _bfd_error_handler
                      /* xgettext:c-format */
-                     (_("%B: '%s' accessed both as normal and thread local symbol"),
+                     (_("%B: '%s' accessed both as normal and"
+                        " thread local symbol"),
                       abfd, name);
                    bfd_set_error (bfd_error_bad_value);
                    goto error_return;
@@ -4773,7 +4774,8 @@ do_ifunc_pointer:
 
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used when making a shared object"),
+                   (_("%B: relocation R_X86_64_GOTOFF64 against undefined %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd, v, h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
@@ -4786,7 +4788,8 @@ do_ifunc_pointer:
                {
                  _bfd_error_handler
              /* xgettext:c-format */
-                   (_("%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"),
+                   (_("%B: relocation R_X86_64_GOTOFF64 against protected %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd,
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);

diff --git a/bfd/elflink.c b/bfd/elflink.c
index ae8fe24..dfcc51e 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -11139,9 +11139,8 @@ elf_fixup_link_order (bfd *abfd, asection *o)
              /* xgettext:c-format */
              (_("%A has both ordered [`%A' in %B] "
                 "and unordered [`%A' in %B] sections"),
-              o, linkorder_sec,
-              linkorder_sec->owner, other_sec,
-              other_sec->owner);
+              o, linkorder_sec, linkorder_sec->owner,
+              other_sec, other_sec->owner);
          else
            _bfd_error_handler
              (_("%A has both ordered and unordered sections"), o);

diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index 92ff8d7..e5ba8f2 100644 (file)
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -3836,8 +3836,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd,
        {
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B: unknown relocation type %d"),
-            input_bfd, (int) r_type);
+           (_("%B: unknown relocation type %d"), input_bfd, (int) r_type);
          bfd_set_error (bfd_error_bad_value);
          ret_val = FALSE;
          continue;

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 08151c1..992ee06 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -7128,7 +7128,8 @@ _bfd_mips_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *hdr)
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B: Warning: bad `%s' option size %u smaller than its header"),
+               (_("%B: Warning: bad `%s' option size %u smaller than"
+                  " its header"),
                abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
              break;
            }
@@ -7362,7 +7363,8 @@ _bfd_mips_elf_section_from_shdr (bfd *abfd,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B: Warning: bad `%s' option size %u smaller than its header"),
+               (_("%B: Warning: bad `%s' option size %u smaller than"
+                  " its header"),
                abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size);
              break;
            }
@@ -8875,7 +8877,8 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
              howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, r_type, FALSE);
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+               (_("%B: relocation %s against `%s' can not be used"
+                  " when making a shared object; recompile with -fPIC"),
                 abfd, howto->name,
                 (h) ? h->root.root.string : "a local symbol");
              bfd_set_error (bfd_error_bad_value);