From e4097f5ee55a0d14a6213bccb9da39d4878714c8 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 11 Apr 2017 15:41:00 -0700 Subject: [PATCH] Remove the extra `\n' in warning/error messages * elf-properties.c (_bfd_elf_parse_gnu_properties): Remove the extra `\n' in warning/error messages. * elf32-i386.c (elf_i386_parse_gnu_properties): Likewise. * elf64-x86-64.c (elf_x86_64_parse_gnu_properties): Likewise. --- bfd/ChangeLog | 7 +++++++ bfd/elf-properties.c | 10 +++++----- bfd/elf32-i386.c | 4 ++-- bfd/elf64-x86-64.c | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 678a00787ed..764f534fe9d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2017-04-11 H.J. Lu + + * elf-properties.c (_bfd_elf_parse_gnu_properties): Remove the + extra `\n' in warning/error messages. + * elf32-i386.c (elf_i386_parse_gnu_properties): Likewise. + * elf64-x86-64.c (elf_x86_64_parse_gnu_properties): Likewise. + 2017-04-11 H.J. Lu * elf-properties.c (_bfd_elf_parse_gnu_properties): Ignore diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c index 04ef53625a3..048ea9c5a49 100644 --- a/bfd/elf-properties.c +++ b/bfd/elf-properties.c @@ -88,7 +88,7 @@ _bfd_elf_parse_gnu_properties (bfd *abfd, Elf_Internal_Note *note) { bad_size: _bfd_error_handler - (_("warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx\n"), + (_("warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx"), abfd, note->type, note->descsz); return FALSE; } @@ -104,7 +104,7 @@ bad_size: if ((ptr + datasz) > ptr_end) { _bfd_error_handler - (_("warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) type (0x%x) datasz: 0x%x\n"), + (_("warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) type (0x%x) datasz: 0x%x"), abfd, note->type, type, datasz); /* Clear all properties. */ elf_properties (abfd) = NULL; @@ -143,7 +143,7 @@ bad_size: if (datasz != align_size) { _bfd_error_handler - (_("warning: %B: corrupt stack size: 0x%x\n"), + (_("warning: %B: corrupt stack size: 0x%x"), abfd, datasz); /* Clear all properties. */ elf_properties (abfd) = NULL; @@ -161,7 +161,7 @@ bad_size: if (datasz != 0) { _bfd_error_handler - (_("warning: %B: corrupt no copy on protected size: 0x%x\n"), + (_("warning: %B: corrupt no copy on protected size: 0x%x"), abfd, datasz); /* Clear all properties. */ elf_properties (abfd) = NULL; @@ -177,7 +177,7 @@ bad_size: } _bfd_error_handler - (_("warning: %B: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x\n"), + (_("warning: %B: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"), abfd, note->type, type); next: diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index b1afb49c6a1..7f2723d5ff7 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -6147,8 +6147,8 @@ elf_i386_parse_gnu_properties (bfd *abfd, unsigned int type, { _bfd_error_handler ((type == GNU_PROPERTY_X86_ISA_1_USED - ? _("error: %B: \n") - : _("error: %B: \n")), + ? _("error: %B: ") + : _("error: %B: ")), abfd, datasz); return property_corrupt; } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index a4048f19584..5d3a65379c7 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -6913,8 +6913,8 @@ elf_x86_64_parse_gnu_properties (bfd *abfd, unsigned int type, { _bfd_error_handler ((type == GNU_PROPERTY_X86_ISA_1_USED - ? _("error: %B: \n") - : _("error: %B: \n")), + ? _("error: %B: ") + : _("error: %B: ")), abfd, datasz); return property_corrupt; } -- 2.30.2