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

PR23431, Messages composed from pieces can't be properly translated 

PR 23431
	* dwarf.c (display_formatted_table): Replace "what" parameter
	with "is_dir".  Expand messages.  Fix capitalisation.
	* testsuite/binutils-all/dw5.W: Update expected output.
This commit is contained in:
Alan Modra 2018-07-24 09:11:35 +09:30
parent 67ce483baa
commit 7b8d9e8cec
3 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/ChangeLog
View File

@ -1,3 +1,10 @@
2018-07-24 Alan Modra <amodra@gmail.com>
PR 23431
* dwarf.c (display_formatted_table): Replace "what" parameter
with "is_dir". Expand messages. Fix capitalisation.
* testsuite/binutils-all/dw5.W: Update expected output.
2018-07-24 Alan Modra <amodra@gmail.com>
PR 23430

34
binutils/dwarf.c
View File

@ -3424,7 +3424,7 @@ display_formatted_table (unsigned char * data,
unsigned char * end,
const DWARF2_Internal_LineInfo * linfo,
struct dwarf_section * section,
const char * what)
bfd_boolean is_dir)
{
unsigned char *format_start, format_count, *format, formati;
dwarf_vma data_count, datai;
@ -3440,7 +3440,10 @@ display_formatted_table (unsigned char * data,
data += bytes_read;
if (data == end)
{
warn (_("Corrupt %s format table entry\n"), what);
if (is_dir)
warn (_("Corrupt directory format table entry\n"));
else
warn (_("Corrupt file name format table entry\n"));
return data;
}
}
@ -3449,18 +3452,28 @@ display_formatted_table (unsigned char * data,
data += bytes_read;
if (data == end)
{
warn (_("Corrupt %s list\n"), what);
if (is_dir)
warn (_("Corrupt directory list\n"));
else
warn (_("Corrupt file name list\n"));
return data;
}
if (data_count == 0)
{
printf (_("\n The %s Table is empty.\n"), what);
if (is_dir)
printf (_("\n The Directory Table is empty.\n"));
else
printf (_("\n The File Name Table is empty.\n"));
return data;
}
printf (_("\n The %s Table (offset 0x%lx):\n"), what,
(long)(data - start));
if (is_dir)
printf (_("\n The Directory Table (offset 0x%lx):\n"),
(long) (data - start));
else
printf (_("\n The File Name Table (offset 0x%lx):\n"),
(long) (data - start));
printf (_(" Entry"));
/* Delay displaying name as the last entry for better screen layout. */
@ -3528,7 +3541,10 @@ display_formatted_table (unsigned char * data,
}
if (data == end)
{
warn (_("Corrupt %s entries list\n"), what);
if (is_dir)
warn (_("Corrupt directory entries list\n"));
else
warn (_("Corrupt file name entries list\n"));
return data;
}
putchar ('\n');
@ -3636,9 +3652,9 @@ display_debug_lines_raw (struct dwarf_section * section,
load_debug_section_with_follow (line_str, file);
data = display_formatted_table (data, start, end, &linfo, section,
_("Directory"));
TRUE);
data = display_formatted_table (data, start, end, &linfo, section,
_("File name"));
FALSE);
}
else
{

2
binutils/testsuite/binutils-all/dw5.W
View File

@ -319,7 +319,7 @@ Raw dump of debug contents of section .debug_line:
1 \(indirect line string, offset: 0x1\):
2 \(indirect line string, offset: 0x22\): /usr/include
The File name Table \(offset 0x34\):
The File Name Table \(offset 0x34\):
Entry Dir Name
0 0 \(indirect line string, offset: 0x14\): main.c
1 1 \(indirect line string, offset: 0x1b\): main.c