From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17683 invoked by alias); 30 Jan 2002 14:08:29 -0000 Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sources.redhat.com Received: (qmail 17637 invoked from network); 30 Jan 2002 14:08:20 -0000 Received: from unknown (HELO Cantor.suse.de) (213.95.15.193) by sources.redhat.com with SMTP; 30 Jan 2002 14:08:20 -0000 Received: from Hermes.suse.de (Hermes.suse.de [213.95.15.136]) by Cantor.suse.de (Postfix) with ESMTP id ABBB71EDA4; Wed, 30 Jan 2002 15:08:19 +0100 (MET) Date: Wed, 30 Jan 2002 06:15:00 -0000 From: Philipp Thomas To: Richard.Earnshaw@arm.com Cc: Nick Clifton , binutils@sources.redhat.com Subject: [PATCH] Unify messages in coff-arm.c and elf32-arm.h Message-ID: <20020130150818.G5439@jeffreys.suse.de> Mail-Followup-To: Philipp Thomas , Richard.Earnshaw@arm.com, Nick Clifton , binutils@sources.redhat.com References: <20020129181350.I15749@jeffreys.suse.de> <200201291835.SAA15180@cam-mail2.cambridge.arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.16i In-Reply-To: <200201291835.SAA15180@cam-mail2.cambridge.arm.com>; from rearnsha@arm.com on Tue, Jan 29, 2002 at 06:35:13PM +0000 X-SW-Source: 2002-01/txt/msg00651.txt.bz2 OK, here is my attempt at unifying the messages in those two files. Can I check it in? 2002-30-01 Philipp Thomas * 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 Development, SuSE Linux AG, Deutscherrnstr. 15-19, D-90429 Nuremberg, Germany