From: Philipp Thomas <pthomas@suse.de>
To: Richard.Earnshaw@arm.com
Cc: Nick Clifton <nickc@redhat.com>, binutils@sources.redhat.com
Subject: [PATCH] Unify messages in coff-arm.c and elf32-arm.h
Date: Wed, 30 Jan 2002 06:15:00 -0000 [thread overview]
Message-ID: <20020130150818.G5439@jeffreys.suse.de> (raw)
In-Reply-To: <200201291835.SAA15180@cam-mail2.cambridge.arm.com>; from rearnsha@arm.com on Tue, Jan 29, 2002 at 06:35:13PM +0000
OK, here is my attempt at unifying the messages in those two files. Can I
check it in?
2002-30-01 Philipp Thomas <pthomas@suse.de>
* coff-arm.c, elf32-elf.h: Unify messages.
Index: coff-arm.c
===================================================================
RCS file: /cvs/src/src/bfd/coff-arm.c,v
retrieving revision 1.31
diff -u -p -r1.31 coff-arm.c
--- coff-arm.c 2001/09/20 23:30:34 1.31
+++ coff-arm.c 2002/01/30 13:59:24
@@ -2297,10 +2297,10 @@ coff_arm_merge_private_bfd_data (ibfd, o
if (INTERWORK_FLAG (ibfd))
/* xgettext: c-format */
- msg = _("Warning: input file %s supports interworking, whereas %s does not.");
+ msg = _("Warning: %s supports interworking, whereas %s does not.");
else
/* xgettext: c-format */
- msg = _("Warning: input file %s does not support interworking, whereas %s does.");
+ msg = _("Warning: %s does not support interworking, whereas %s does.");
_bfd_error_handler (msg, bfd_archive_filename (ibfd),
bfd_get_filename (obfd));
@@ -2398,7 +2398,7 @@ _bfd_coff_arm_set_private_flags (abfd, f
{
if (flag)
/* xgettext: c-format */
- _bfd_error_handler (_("Warning: Not setting interworking flag of %s, since it has already been specified as non-interworking"),
+ _bfd_error_handler (_("Warning: Not setting interworking flag of %s since it has already been specified as non-interworking"),
bfd_archive_filename (abfd));
else
/* xgettext: c-format */
@@ -2461,7 +2461,8 @@ coff_arm_copy_private_bfd_data (src, des
if (INTERWORK_FLAG (dest))
{
/* xgettext:c-format */
- _bfd_error_handler (("Warning: Clearing the interworking bit of %s, because the non-interworking code in %s has been copied into it"),
+ _bfd_error_handler (("\
+Warning: Clearing the interworking flag of %s, because non-interworking code in %s has been linked with it"),
bfd_get_filename (dest),
bfd_archive_filename (src));
}
Index: elf32-arm.h
===================================================================
RCS file: /cvs/src/src/bfd/elf32-arm.h,v
retrieving revision 1.71
diff -u -p -r1.71 elf32-arm.h
--- elf32-arm.h 2002/01/16 13:01:54 1.71
+++ elf32-arm.h 2002/01/30 13:59:25
@@ -2112,11 +2112,11 @@ elf32_arm_set_private_flags (abfd, flags
{
if (flags & EF_ARM_INTERWORK)
(*_bfd_error_handler) (_("\
-Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"),
+Warning: Not setting interworking flag of %s since it has already been specified as non-interworking"),
bfd_archive_filename (abfd));
else
_bfd_error_handler (_("\
-Warning: Clearing the interwork flag of %s due to outside request"),
+Warning: Clearing the interworking flag of %s due to outside request"),
bfd_archive_filename (abfd));
}
}
@@ -2164,7 +2164,7 @@ elf32_arm_copy_private_bfd_data (ibfd, o
{
if (out_flags & EF_ARM_INTERWORK)
_bfd_error_handler (_("\
-Warning: Clearing the interwork flag in %s because non-interworking code in %s has been linked with it"),
+Warning: Clearing the interworking flag of %s because non-interworking code in %s has been linked with it"),
bfd_get_filename (obfd),
bfd_archive_filename (ibfd));
--
Philipp Thomas <pthomas@suse.de>
Development, SuSE Linux AG, Deutscherrnstr. 15-19, D-90429 Nuremberg, Germany
next prev parent reply other threads:[~2002-01-30 14:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-01-29 10:04 Possibly unnecessary differences in messages Philipp Thomas
2002-01-29 11:16 ` Richard Earnshaw
2002-01-30 6:08 ` Philipp Thomas
2002-01-30 6:12 ` Richard Earnshaw
2002-01-30 6:15 ` Philipp Thomas [this message]
2002-01-30 6:21 ` [PATCH] Unify messages in coff-arm.c and elf32-arm.h Richard Earnshaw
2002-01-30 6:24 ` Richard Earnshaw
2002-01-30 6:53 ` Philipp Thomas
2002-01-30 8:41 ` Richard Earnshaw
2002-01-30 9:05 ` Philipp Thomas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020130150818.G5439@jeffreys.suse.de \
--to=pthomas@suse.de \
--cc=Richard.Earnshaw@arm.com \
--cc=binutils@sources.redhat.com \
--cc=nickc@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).