OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AOUT/COFF/PE messages

Browse Source 
Capitalization, full-stops and unnecessary trailing \n fixes.

	* aout-adobe.c, * aout-cris.c, * i386linux.c, * m68klinux.c,
	* sparclinux.c, * coff-alpha.c, * coff-arm.c, * coff-mcore.c,
	* coffcode.h, * coffgen.c, * cofflink.c, * ecoff.c, * pe-mips.c,
	* peXXigen.c, * peicode.h: Standardize error/warning messages.
This commit is contained in:
Alan Modra 2018-02-21 13:07:59 +10:30
parent 90b6238f06
commit 59d08d6ce8
16 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2018-02-26 Alan Modra <amodra@gmail.com>
* aout-adobe.c, * aout-cris.c, * i386linux.c, * m68klinux.c,
* sparclinux.c, * coff-alpha.c, * coff-arm.c, * coff-mcore.c,
* coffcode.h, * coffgen.c, * cofflink.c, * ecoff.c, * pe-mips.c,
* peXXigen.c, * peicode.h: Standardize error/warning messages.
2018-02-26 Alan Modra <amodra@gmail.com>
* elf32-arm.c, * elfnn-aarch64.c: Standardize error/warning messages.

2
bfd/aout-adobe.c
View File

@ -123,7 +123,7 @@ aout_adobe_callback (bfd *abfd)
default:
_bfd_error_handler
/* xgettext:c-format */
(_("%pB: Unknown section type in a.out.adobe file: %x\n"),
(_("%pB: unknown section type in a.out.adobe file: %x"),
abfd, ext->e_type[0]);
goto no_more_sections;
}

6
bfd/aout-cris.c
View File

@ -197,7 +197,7 @@ MY (swap_ext_reloc_out) (bfd *abfd,
if (r_type > 2)
{
/* xgettext:c-format */
_bfd_error_handler (_("%pB: Invalid relocation type exported: %d"),
_bfd_error_handler (_("%pB: invalid relocation type exported: %d"),
abfd, r_type);
bfd_set_error (bfd_error_wrong_format);
@ -241,7 +241,7 @@ MY (swap_ext_reloc_in) (bfd *abfd,
if (r_type > 2)
{
/* xgettext:c-format */
_bfd_error_handler (_("%pB: Invalid relocation type imported: %d"),
_bfd_error_handler (_("%pB: invalid relocation type imported: %d"),
abfd, r_type);
bfd_set_error (bfd_error_wrong_format);
@ -253,7 +253,7 @@ MY (swap_ext_reloc_in) (bfd *abfd,
{
_bfd_error_handler
/* xgettext:c-format */
(_("%pB: Bad relocation record imported: %d"), abfd, r_index);
(_("%pB: bad relocation record imported: %d"), abfd, r_index);
bfd_set_error (bfd_error_wrong_format);

4
bfd/coff-alpha.c
View File

@ -447,8 +447,8 @@ alpha_ecoff_bad_format_hook (bfd *abfd ATTRIBUTE_UNUSED,
if (ALPHA_ECOFF_COMPRESSEDMAG (*internal_f))
_bfd_error_handler
(_("%pB: Cannot handle compressed Alpha binaries.\n"
" Use compiler flags, or objZ, to generate uncompressed binaries."),
(_("%pB: cannot handle compressed Alpha binaries; "
"use compiler flags, or objZ, to generate uncompressed binaries"),
abfd);
return FALSE;

21
bfd/coff-arm.c
View File

@ -1365,8 +1365,8 @@ coff_arm_relocate_section (bfd *output_bfd,
&& ! INTERWORK_FLAG (h_sec->owner))
_bfd_error_handler
/* xgettext:c-format */
(_("%pB(%s): warning: interworking not enabled.\n"
" first occurrence: %pB: arm call to thumb"),
(_("%pB(%s): warning: interworking not enabled; "
"first occurrence: %pB: arm call to thumb"),
h_sec->owner, name, input_bfd);
--my_offset;
@ -1455,9 +1455,10 @@ coff_arm_relocate_section (bfd *output_bfd,
&& ! globals->support_old_code)
_bfd_error_handler
/* xgettext:c-format */
(_("%pB(%s): warning: interworking not enabled.\n"
" first occurrence: %pB: thumb call to arm\n"
" consider relinking with --support-old-code enabled"),
(_("%pB(%s): warning: interworking not enabled; "
"first occurrence: %pB: thumb call to arm; "
"consider relinking with --support-old-code "
"enabled"),
h_sec->owner, name, input_bfd);
-- my_offset;
@ -2268,12 +2269,12 @@ error: %pB is compiled as absolute position code, whereas target %pB is position
if (INTERWORK_FLAG (ibfd))
/* xgettext: c-format */
_bfd_error_handler (_("\
Warning: %pB supports interworking, whereas %pB does not"),
warning: %pB supports interworking, whereas %pB does not"),
ibfd, obfd);
else
/* xgettext: c-format */
_bfd_error_handler (_("\
Warning: %pB does not support interworking, whereas %pB does"),
warning: %pB does not support interworking, whereas %pB does"),
ibfd, obfd);
}
}
@ -2363,10 +2364,10 @@ _bfd_coff_arm_set_private_flags (bfd * abfd, flagword flags)
if (INTERWORK_SET (abfd) && (INTERWORK_FLAG (abfd) != flag))
{
if (flag)
_bfd_error_handler (_("Warning: Not setting interworking flag of %pB since it has already been specified as non-interworking"),
_bfd_error_handler (_("warning: not setting interworking flag of %pB since it has already been specified as non-interworking"),
abfd);
else
_bfd_error_handler (_("Warning: Clearing the interworking flag of %pB due to outside request"),
_bfd_error_handler (_("warning: clearing the interworking flag of %pB due to outside request"),
abfd);
flag = 0;
}
@ -2424,7 +2425,7 @@ coff_arm_copy_private_bfd_data (bfd * src, bfd * dest)
{
/* xgettext:c-format */
_bfd_error_handler (_("\
Warning: Clearing the interworking flag of %pB because non-interworking code in %pB has been linked with it"),
warning: clearing the interworking flag of %pB because non-interworking code in %pB has been linked with it"),
dest, src);
}

2
bfd/coff-mcore.c
View File

@ -478,7 +478,7 @@ coff_mcore_relocate_section (bfd * output_bfd,
case IMAGE_REL_MCORE_ABSOLUTE:
_bfd_error_handler
/* xgettext: c-format */
(_("Warning: unsupported reloc %s <file %pB, section %pA>\n"
(_("warning: unsupported reloc %s <file %pB, section %pA>\n"
"sym %ld (%s), r_vaddr %" PRId64 " (%#" PRIx64 ")"),
howto->name, input_bfd, input_section,
rel->r_symndx, my_name, (int64_t) rel->r_vaddr,

14
bfd/coffcode.h
View File

@ -1022,7 +1022,7 @@ handle_COMDAT (bfd * abfd,
if (esym + bfd_coff_symesz (abfd) >= esymend)
{
/* xgettext:c-format */
_bfd_error_handler (_("%pB: warning: No symbol for"
_bfd_error_handler (_("%pB: warning: no symbol for"
" section '%s' found"),
abfd, symname);
break;
@ -1248,9 +1248,9 @@ 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 (_("%pB: Warning: Ignoring section flag"
" IMAGE_SCN_MEM_NOT_PAGED in section %s"),
abfd, name);
_bfd_error_handler (_("%pB: warning: ignoring section flag"
" %s in section %s"),
abfd, "IMAGE_SCN_MEM_NOT_PAGED", name);
break;
case IMAGE_SCN_MEM_EXECUTE:
sec_flags |= SEC_CODE;
@ -1317,7 +1317,7 @@ styp_to_sec_flags (bfd *abfd,
{
_bfd_error_handler
/* xgettext:c-format */
(_("%pB (%s): Section flag %s (%#lx) ignored"),
(_("%pB (%s): section flag %s (%#lx) ignored"),
abfd, name, unhandled, flag);
result = FALSE;
}
@ -2467,7 +2467,7 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr)
default:
arch = bfd_arch_obscure;
_bfd_error_handler
(_("Unrecognized TI COFF target id '0x%x'"),
(_("unrecognized TI COFF target id '0x%x'"),
internal_f->f_target_id);
break;
}
@ -5100,7 +5100,7 @@ coff_slurp_symbol_table (bfd * abfd)
default:
_bfd_error_handler
/* xgettext:c-format */
(_("%pB: Unrecognized storage class %d for %s symbol `%s'"),
(_("%pB: unrecognized storage class %d for %s symbol `%s'"),
abfd, src->u.syment.n_sclass,
dst->symbol.section->name, dst->symbol.name);
ret = FALSE;

4
bfd/coffgen.c
View File

@ -3024,7 +3024,7 @@ coff_gc_sweep (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info)
if (info->print_gc_sections && o->size != 0)
/* xgettext: c-format */
_bfd_error_handler (_("Removing unused section '%pA' in file '%pB'"),
_bfd_error_handler (_("removing unused section '%pA' in file '%pB'"),
o, sub);
#if 0
@ -3101,7 +3101,7 @@ bfd_coff_gc_sections (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info)
if (!bed->can_gc_sections
|| !is_coff_hash_table (info->hash))
{
_bfd_error_handler(_("Warning: gc-sections option ignored"));
_bfd_error_handler(_("warning: gc-sections option ignored"));
return TRUE;
}
#endif

4
bfd/cofflink.c
View File

@ -349,7 +349,7 @@ coff_link_add_symbols (bfd *abfd,
&& (*sym_hash)->root.type != bfd_link_hash_undefined
&& (*sym_hash)->root.type != bfd_link_hash_undefweak)
_bfd_error_handler
(_("Warning: symbol `%s' is both section and non-section"),
(_("warning: symbol `%s' is both section and non-section"),
name);
addit = FALSE;
@ -451,7 +451,7 @@ coff_link_add_symbols (bfd *abfd,
|| BTYPE (sym.n_type) == T_NULL)))
_bfd_error_handler
/* xgettext: c-format */
(_("Warning: type of symbol `%s' changed"
(_("warning: type of symbol `%s' changed"
" from %d to %d in %pB"),
name, (*sym_hash)->type, sym.n_type, abfd);

2
bfd/ecoff.c
View File

@ -1265,7 +1265,7 @@ ecoff_type_to_string (bfd *abfd, FDR *fdr, unsigned int indx)
break;
default:
sprintf (p1, _("Unknown basic type %d"), (int) basic_type);
sprintf (p1, _("unknown basic type %d"), (int) basic_type);
break;
}

10
bfd/i386linux.c
View File

@ -413,7 +413,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
if (p == NULL || alloc == NULL)
_bfd_error_handler (_("Output file requires shared library `%s'\n"),
_bfd_error_handler (_("output file requires shared library `%s'"),
name);
else
{
@ -421,7 +421,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
p = strrchr (alloc, '_');
*p++ = '\0';
_bfd_error_handler
(_("Output file requires shared library `%s.so.%s'\n"),
(_("output file requires shared library `%s.so.%s'"),
alloc, p);
free (alloc);
}
@ -608,7 +608,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
&& f->h->root.root.type != bfd_link_hash_defweak)
{
_bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
(_("symbol %s not defined for fixups"),
f->h->root.root.root.string);
continue;
}
@ -658,7 +658,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
&& f->h->root.root.type != bfd_link_hash_defweak)
{
_bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
(_("symbol %s not defined for fixups"),
f->h->root.root.root.string);
continue;
}
@ -682,7 +682,7 @@ linux_finish_dynamic_link (bfd *output_bfd,
if (linux_hash_table (info)->fixup_count != fixups_written)
{
_bfd_error_handler (_("Warning: fixup count mismatch\n"));
_bfd_error_handler (_("warning: fixup count mismatch"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);

10
bfd/m68klinux.c
View File

@ -416,7 +416,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h,
alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
if (p == NULL || alloc == NULL)
_bfd_error_handler (_("Output file requires shared library `%s'\n"),
_bfd_error_handler (_("output file requires shared library `%s'"),
name);
else
{
@ -425,7 +425,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h,
*p++ = '\0';
_bfd_error_handler
/* xgettext:c-format */
(_("Output file requires shared library `%s.so.%s'\n"),
(_("output file requires shared library `%s.so.%s'"),
alloc, p);
free (alloc);
}
@ -614,7 +614,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
&& f->h->root.root.type != bfd_link_hash_defweak)
{
_bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
(_("symbol %s not defined for fixups"),
f->h->root.root.root.string);
continue;
}
@ -662,7 +662,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
&& f->h->root.root.type != bfd_link_hash_defweak)
{
_bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
(_("symbol %s not defined for fixups"),
f->h->root.root.root.string);
continue;
}
@ -686,7 +686,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (linux_hash_table (info)->fixup_count != fixups_written)
{
_bfd_error_handler (_("Warning: fixup count mismatch\n"));
_bfd_error_handler (_("warning: fixup count mismatch"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);

8
bfd/pe-mips.c
View File

@ -606,7 +606,7 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
if (bfd_link_relocatable (info))
{
_bfd_error_handler
(_("%pB: `ld -r' not supported with PE MIPS objects\n"), input_bfd);
(_("%pB: `ld -r' not supported with PE MIPS objects"), input_bfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@ -717,7 +717,7 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
#define UI(x) \
/* xgettext:c-format */ \
_bfd_error_handler (_("%pB: unimplemented %s\n"), \
_bfd_error_handler (_("%pB: unimplemented %s"), \
input_bfd, x); \
bfd_set_error (bfd_error_bad_value);
@ -743,7 +743,7 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
targ = val + (tmp & 0x03ffffff) * 4;
if ((src & 0xf0000000) != (targ & 0xf0000000))
{
_bfd_error_handler (_("%pB: jump too far away\n"), input_bfd);
_bfd_error_handler (_("%pB: jump too far away"), input_bfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@ -769,7 +769,7 @@ coff_pe_mips_relocate_section (bfd *output_bfd,
targ = val + low + ((tmp & 0xffff) << 16);
break;
default:
_bfd_error_handler (_("%pB: bad pair/reflo after refhi\n"),
_bfd_error_handler (_("%pB: bad pair/reflo after refhi"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
return FALSE;

12
bfd/peXXigen.c
View File

@ -1903,7 +1903,7 @@ pe_print_pdata (bfd * abfd, void * vfile)
if ((stop % onaline) != 0)
fprintf (file,
/* xgettext:c-format */
_("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
_("warning, .pdata section size (%ld) is not a multiple of %d\n"),
(long) stop, onaline);
fprintf (file,
@ -2100,7 +2100,7 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile)
if ((stop % onaline) != 0)
fprintf (file,
/* xgettext:c-format */
_("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
_("warning, .pdata section size (%ld) is not a multiple of %d\n"),
(long) stop, onaline);
fprintf (file,
@ -3018,13 +3018,13 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd)
if (!bfd_set_section_contents (obfd, section, data, 0, section->size))
{
_bfd_error_handler (_("Failed to update file offsets in debug directory"));
_bfd_error_handler (_("failed to update file offsets in debug directory"));
return FALSE;
}
}
else if (section)
{
_bfd_error_handler (_("%pB: Failed to read debug data section"), obfd);
_bfd_error_handler (_("%pB: failed to read debug data section"), obfd);
return FALSE;
}
}
@ -4103,14 +4103,14 @@ rsrc_merge (struct rsrc_entry * a, struct rsrc_entry * b)
if (adir->characteristics != bdir->characteristics)
{
_bfd_error_handler (_(".rsrc merge failure: dirs with differing characteristics\n"));
_bfd_error_handler (_(".rsrc merge failure: dirs with differing characteristics"));
bfd_set_error (bfd_error_file_truncated);
return;
}
if (adir->major != bdir->major || adir->minor != bdir->minor)
{
_bfd_error_handler (_(".rsrc merge failure: differing directory versions\n"));
_bfd_error_handler (_(".rsrc merge failure: differing directory versions"));
bfd_set_error (bfd_error_file_truncated);
return;
}

17
bfd/peicode.h
View File

@ -772,13 +772,13 @@ pe_ILF_build_a_bfd (bfd * abfd,
case IMPORT_CONST:
/* XXX code yet to be written. */
/* xgettext:c-format */
_bfd_error_handler (_("%pB: Unhandled import type; %x"),
_bfd_error_handler (_("%pB: unhandled import type; %x"),
abfd, import_type);
return FALSE;
default:
/* xgettext:c-format */
_bfd_error_handler (_("%pB: Unrecognised import type; %x"),
_bfd_error_handler (_("%pB: unrecognized import type; %x"),
abfd, import_type);
return FALSE;
}
@ -793,7 +793,7 @@ pe_ILF_build_a_bfd (bfd * abfd,
default:
/* xgettext:c-format */
_bfd_error_handler (_("%pB: Unrecognised import name type; %x"),
_bfd_error_handler (_("%pB: unrecognized import name type; %x"),
abfd, import_name_type);
return FALSE;
}
@ -1214,7 +1214,7 @@ pe_ILF_object_p (bfd * abfd)
default:
_bfd_error_handler
/* xgettext:c-format */
(_("%pB: Unrecognised machine type (0x%x)"
(_("%pB: unrecognised machine type (0x%x)"
" in Import Library Format archive"),
abfd, machine);
bfd_set_error (bfd_error_malformed_archive);
@ -1227,7 +1227,7 @@ pe_ILF_object_p (bfd * abfd)
{
_bfd_error_handler
/* xgettext:c-format */
(_("%pB: Recognised but unhandled machine type (0x%x)"
(_("%pB: recognised but unhandled machine type (0x%x)"
" in Import Library Format archive"),
abfd, machine);
bfd_set_error (bfd_error_wrong_format);
@ -1277,7 +1277,7 @@ pe_ILF_object_p (bfd * abfd)
|| (bfd_size_type) ((bfd_byte *) source_dll - ptr) >= size)
{
_bfd_error_handler
(_("%pB: string not null terminated in ILF object file."), abfd);
(_("%pB: string not null terminated in ILF object file"), abfd);
bfd_set_error (bfd_error_malformed_archive);
bfd_release (abfd, ptr);
return NULL;
@ -1332,8 +1332,9 @@ pe_bfd_read_buildid (bfd *abfd)
if (dataoff >= section->size
|| size > section->size - dataoff)
{
_bfd_error_handler (_("%pB: Error: Debug Data ends beyond end of debug directory."),
abfd);
_bfd_error_handler
(_("%pB: error: debug data ends beyond end of debug directory"),
abfd);
return;
}

10
bfd/sparclinux.c
View File

@ -409,7 +409,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
alloc = (char *) bfd_malloc ((bfd_size_type) strlen (name) + 1);
if (p == NULL || alloc == NULL)
_bfd_error_handler (_("Output file requires shared library `%s'\n"),
_bfd_error_handler (_("output file requires shared library `%s'"),
name);
else
{
@ -418,7 +418,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data)
*p++ = '\0';
_bfd_error_handler
/* xgettext:c-format */
(_("Output file requires shared library `%s.so.%s'\n"),
(_("output file requires shared library `%s.so.%s'"),
alloc, p);
free (alloc);
}
@ -605,7 +605,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
&& f->h->root.root.type != bfd_link_hash_defweak)
{
_bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
(_("symbol %s not defined for fixups"),
f->h->root.root.root.string);
continue;
}
@ -655,7 +655,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
&& f->h->root.root.type != bfd_link_hash_defweak)
{
_bfd_error_handler
(_("Symbol %s not defined for fixups\n"),
(_("symbol %s not defined for fixups"),
f->h->root.root.root.string);
continue;
}
@ -679,7 +679,7 @@ linux_finish_dynamic_link (bfd *output_bfd, struct bfd_link_info *info)
if (linux_hash_table (info)->fixup_count != fixups_written)
{
_bfd_error_handler (_("Warning: fixup count mismatch\n"));
_bfd_error_handler (_("warning: fixup count mismatch"));
while (linux_hash_table (info)->fixup_count > fixups_written)
{
bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table);