This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: More binutils-2.20.90.pot bugs
- From: Alan Modra <amodra at gmail dot com>
- To: Jorma Karvonen <karvonen dot jorma at gmail dot com>
- Cc: binutils at sourceware dot org
- Date: Wed, 17 Nov 2010 14:06:45 +1030
- Subject: Re: More binutils-2.20.90.pot bugs
- References: <AANLkTinN7JmwCNj+3Wmu8ie_T9nsWe1TjYJqb7+fu4A0@mail.gmail.com>
http://lists.gnu.org/archive/html/bug-binutils/2010-11/msg00056.html
Applied mainline.
* ar.c (print_contents): Don't internationalize strings without words.
* dwarf.c (process_extended_line_op): Likewise.
(process_debug_info): Likwise.
(display_debug_lines_raw): Likewise.
(display_debug_lines_decoded): Likewise.
(display_debug_abbrev): Likewise.
* readelf.c (process_file_header): Likewise.
(GET_OP): Likewise.
(decode_arm_unwind): Likewise.
(process_mips_specific): Likewise.
* resrc.c (run_cmd): Likewise.
(rcparse_warning): Likewise.
* objdump.c (dump_headers): Don't print "Pg".
Index: binutils/ar.c
===================================================================
RCS file: /cvs/src/src/binutils/ar.c,v
retrieving revision 1.67
diff -u -p -r1.67 ar.c
--- binutils/ar.c 29 Oct 2010 08:47:02 -0000 1.67
+++ binutils/ar.c 17 Nov 2010 03:27:10 -0000
@@ -820,8 +820,7 @@ print_contents (bfd *abfd)
fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
if (verbose)
- /* xgettext:c-format */
- printf (_("\n<%s>\n\n"), bfd_get_filename (abfd));
+ printf ("\n<%s>\n\n", bfd_get_filename (abfd));
bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
Index: binutils/dwarf.c
===================================================================
RCS file: /cvs/src/src/binutils/dwarf.c,v
retrieving revision 1.77
diff -u -p -r1.77 dwarf.c
--- binutils/dwarf.c 9 Oct 2010 05:52:28 -0000 1.77
+++ binutils/dwarf.c 17 Nov 2010 03:27:11 -0000
@@ -336,15 +336,15 @@ process_extended_line_op (unsigned char
printf (_(" define new File Table entry\n"));
printf (_(" Entry\tDir\tTime\tSize\tName\n"));
- printf (_(" %d\t"), ++state_machine_regs.last_file_entry);
+ printf (" %d\t", ++state_machine_regs.last_file_entry);
name = data;
data += strlen ((char *) data) + 1;
- printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+ printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
data += bytes_read;
- printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+ printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
data += bytes_read;
- printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
- printf (_("%s\n\n"), name);
+ printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
+ printf ("%s\n\n", name);
break;
case DW_LNE_set_discriminator:
@@ -2203,7 +2203,7 @@ process_debug_info (struct dwarf_section
}
if (!do_loc)
- printf (_(" (%s)\n"), get_TAG_name (entry->tag));
+ printf (" (%s)\n", get_TAG_name (entry->tag));
switch (entry->tag)
{
@@ -2413,7 +2413,7 @@ display_debug_lines_raw (struct dwarf_se
while (*data != 0)
{
- printf (_(" %s\n"), data);
+ printf (" %s\n", data);
data += strlen ((char *) data) + 1;
}
@@ -2435,18 +2435,18 @@ display_debug_lines_raw (struct dwarf_se
unsigned char *name;
unsigned int bytes_read;
- printf (_(" %d\t"), ++state_machine_regs.last_file_entry);
+ printf (" %d\t", ++state_machine_regs.last_file_entry);
name = data;
data += strlen ((char *) data) + 1;
- printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+ printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
data += bytes_read;
- printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+ printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
data += bytes_read;
- printf (_("%lu\t"), read_leb128 (data, & bytes_read, 0));
+ printf ("%lu\t", read_leb128 (data, & bytes_read, 0));
data += bytes_read;
- printf (_("%s\n"), name);
+ printf ("%s\n", name);
}
}
@@ -2824,14 +2824,11 @@ display_debug_lines_decoded (struct dwar
else
{
if (do_wide || strlen ((char *) directory_table[0]) < 76)
- {
- printf (_("CU: %s/%s:\n"), directory_table[0],
- file_table[0].name);
- }
+ printf (_("CU: %s/%s:\n"), directory_table[0],
+ file_table[0].name);
else
- {
- printf (_("%s:\n"), file_table[0].name);
- }
+ printf ("%s:\n", file_table[0].name);
+
printf (_("File name Line number Starting address\n"));
}
}
@@ -2915,7 +2912,7 @@ display_debug_lines_decoded (struct dwar
op_code_data += bytes_read;
read_leb128 (op_code_data, & bytes_read, 0);
- printf (_("%s:\n"), directory_table[dir_index]);
+ printf ("%s:\n", directory_table[dir_index]);
break;
}
default:
@@ -2961,13 +2958,13 @@ display_debug_lines_decoded (struct dwar
if (file_table[state_machine_regs.file - 1].directory_index == 0)
{
/* If directory index is 0, that means current directory. */
- printf (_("\n./%s:[++]\n"),
+ printf ("\n./%s:[++]\n",
file_table[state_machine_regs.file - 1].name);
}
else
{
/* The directory index starts counting at 1. */
- printf (_("\n%s/%s:\n"),
+ printf ("\n%s/%s:\n",
directory_table[file_table[state_machine_regs.file - 1].directory_index - 1],
file_table[state_machine_regs.file - 1].name);
}
@@ -3067,11 +3064,11 @@ display_debug_lines_decoded (struct dwar
if (!do_wide || (fileNameLength <= MAX_FILENAME_LENGTH))
{
if (linfo.li_max_ops_per_insn == 1)
- printf (_("%-35s %11d %#18lx\n"), newFileName,
+ printf ("%-35s %11d %#18lx\n", newFileName,
state_machine_regs.line,
state_machine_regs.address);
else
- printf (_("%-35s %11d %#18lx[%d]\n"), newFileName,
+ printf ("%-35s %11d %#18lx[%d]\n", newFileName,
state_machine_regs.line,
state_machine_regs.address,
state_machine_regs.op_index);
@@ -3079,11 +3076,11 @@ display_debug_lines_decoded (struct dwar
else
{
if (linfo.li_max_ops_per_insn == 1)
- printf (_("%s %11d %#18lx\n"), newFileName,
+ printf ("%s %11d %#18lx\n", newFileName,
state_machine_regs.line,
state_machine_regs.address);
else
- printf (_("%s %11d %#18lx[%d]\n"), newFileName,
+ printf ("%s %11d %#18lx[%d]\n", newFileName,
state_machine_regs.line,
state_machine_regs.address,
state_machine_regs.op_index);
@@ -3340,13 +3337,13 @@ display_debug_abbrev (struct dwarf_secti
{
abbrev_attr *attr;
- printf (_(" %ld %s [%s]\n"),
+ printf (" %ld %s [%s]\n",
entry->entry,
get_TAG_name (entry->tag),
entry->children ? _("has children") : _("no children"));
for (attr = entry->first_attr; attr; attr = attr->next)
- printf (_(" %-18s %s\n"),
+ printf (" %-18s %s\n",
get_AT_name (attr->attribute),
get_FORM_name (attr->form));
}
Index: binutils/objdump.c
===================================================================
RCS file: /cvs/src/src/binutils/objdump.c,v
retrieving revision 1.179
diff -u -p -r1.179 objdump.c
--- binutils/objdump.c 3 Nov 2010 02:31:02 -0000 1.179
+++ binutils/objdump.c 17 Nov 2010 03:27:12 -0000
@@ -511,8 +511,6 @@ dump_headers (bfd *abfd)
if (wide_output)
printf (_(" Flags"));
- if (abfd->flags & HAS_LOAD_PAGE)
- printf (_(" Pg"));
printf ("\n");
bfd_map_over_sections (abfd, dump_section_header, NULL);
Index: binutils/readelf.c
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.524
diff -u -p -r1.524 readelf.c
--- binutils/readelf.c 15 Nov 2010 22:30:46 -0000 1.524
+++ binutils/readelf.c 17 Nov 2010 03:27:16 -0000
@@ -3564,7 +3564,7 @@ process_file_header (void)
if (section_headers != NULL
&& elf_header.e_phnum == PN_XNUM
&& section_headers[0].sh_info != 0)
- printf (_(" (%ld)"), (long) section_headers[0].sh_info);
+ printf (" (%ld)", (long) section_headers[0].sh_info);
putc ('\n', stdout);
printf (_(" Size of section headers: %ld (bytes)\n"),
(long) elf_header.e_shentsize);
@@ -6442,7 +6442,7 @@ decode_arm_unwind (struct arm_unw_aux_in
printf (_("[Truncated opcode]\n")); \
return; \
} \
- printf (_("0x%02x "), OP)
+ printf ("0x%02x ", OP)
if (remaining == 0)
{
@@ -6528,17 +6528,17 @@ decode_arm_unwind (struct arm_unw_aux_in
op = word >> 24;
word <<= 8;
- printf (_(" 0x%02x "), op);
+ printf (" 0x%02x ", op);
if ((op & 0xc0) == 0x00)
{
int offset = ((op & 0x3f) << 2) + 4;
- printf (_(" vsp = vsp + %d"), offset);
+ printf (" vsp = vsp + %d", offset);
}
else if ((op & 0xc0) == 0x40)
{
int offset = ((op & 0x3f) << 2) + 4;
- printf (_(" vsp = vsp - %d"), offset);
+ printf (" vsp = vsp - %d", offset);
}
else if ((op & 0xf0) == 0x80)
{
@@ -6569,7 +6569,7 @@ decode_arm_unwind (struct arm_unw_aux_in
if (op == 0x9d || op == 0x9f)
printf (_(" [Reserved]"));
else
- printf (_(" vsp = r%d"), op & 0x0f);
+ printf (" vsp = r%d", op & 0x0f);
}
else if ((op & 0xf0) == 0xa0)
{
@@ -6633,7 +6633,7 @@ decode_arm_unwind (struct arm_unw_aux_in
offset = read_uleb128 (buf, &len);
assert (len == i + 1);
offset = offset * 4 + 0x204;
- printf (_("vsp = vsp + %ld"), offset);
+ printf ("vsp = vsp + %ld", offset);
}
else
{
@@ -11684,7 +11684,7 @@ process_mips_specific (FILE * file)
if (ent < local_end)
{
printf (_(" Local entries:\n"));
- printf (_(" %*s %10s %*s\n"),
+ printf (" %*s %10s %*s\n",
addr_size * 2, _("Address"), _("Access"),
addr_size * 2, _("Initial"));
while (ent < local_end)
@@ -11700,7 +11700,7 @@ process_mips_specific (FILE * file)
int sym_width;
printf (_(" Global entries:\n"));
- printf (_(" %*s %10s %*s %*s %-7s %3s %s\n"),
+ printf (" %*s %10s %*s %*s %-7s %3s %s\n",
addr_size * 2, _("Address"), _("Access"),
addr_size * 2, _("Initial"),
addr_size * 2, _("Sym.Val."), _("Type"), _("Ndx"), _("Name"));
@@ -11768,7 +11768,7 @@ process_mips_specific (FILE * file)
printf ("\n");
printf (_(" Entries:\n"));
- printf (_(" %*s %*s %*s %-7s %3s %s\n"),
+ printf (" %*s %*s %*s %-7s %3s %s\n",
addr_size * 2, _("Address"),
addr_size * 2, _("Initial"),
addr_size * 2, _("Sym.Val."), _("Type"), _("Ndx"), _("Name"));
Index: binutils/resrc.c
===================================================================
RCS file: /cvs/src/src/binutils/resrc.c,v
retrieving revision 1.36
diff -u -p -r1.36 resrc.c
--- binutils/resrc.c 11 Dec 2009 13:42:06 -0000 1.36
+++ binutils/resrc.c 17 Nov 2010 03:27:16 -0000
@@ -281,7 +281,7 @@ run_cmd (char *cmd, const char *redir)
if (pid == -1)
{
- fatal (_("%s %s: %s"), errmsg_fmt, errmsg_arg, strerror (errno));
+ fatal ("%s %s: %s", errmsg_fmt, errmsg_arg, strerror (errno));
return 1;
}
@@ -628,7 +628,7 @@ yyerror (const char *msg)
void
rcparse_warning (const char *msg)
{
- fprintf (stderr, _("%s:%d: %s\n"), rc_filename, rc_lineno, msg);
+ fprintf (stderr, "%s:%d: %s\n", rc_filename, rc_lineno, msg);
}
/* Die if we get an unexpected end of file. */
--
Alan Modra
Australia Development Lab, IBM