From 5e9b84f7a2e13af9ed00e262ad844e192b88ea8c Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Wed, 29 Jul 2020 13:50:10 +0100 Subject: binutils, ld: dequote libctf error messages These are not identifiers and should not be quoted. (Also, quoting them just looks odd.) Adjust diagnostics tests accordingly. binutils/ChangeLog 2020-08-27 Nick Alcock * objdump.c (dump_ctf_errs): Unquote CTF error messages. * readelf.c (dump_ctf_errs): Likewise. ld/ChangeLog 2020-08-27 Nick Alcock * ldlang.c (dump_ctf_errs): Unquote CTF error messages. (ldlang_open_ctf): Likewise. (lang_merge_ctf): Likewise. (lang_write_ctf): Likewise. * testsuite/ld-ctf/diag-ctf-version-f.d: Adjust. * testsuite/ld-ctf/diag-cttname-invalid.d: Adjust. * testsuite/ld-ctf/diag-decompression-failure.d: Adjust. * testsuite/ld-ctf/diag-parname.d: Adjust. * testsuite/ld-ctf/diag-unsupported-flag.d: Adjust. * testsuite/ld-ctf/diag-wrong-magic-number-mixed.d: Adjust. * testsuite/ld-ctf/diag-wrong-magic-number.d: Adjust. --- binutils/ChangeLog | 5 +++++ binutils/objdump.c | 2 +- binutils/readelf.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 05423bd..44c2898 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,10 @@ 2020-08-27 Nick Alcock + * objdump.c (dump_ctf_errs): Unquote CTF error messages. + * readelf.c (dump_ctf_errs): Likewise. + +2020-08-27 Nick Alcock + * objdump.c (dump_ctf_archive_member): Move error- reporting... (dump_ctf_errs): ... into this separate function. diff --git a/binutils/objdump.c b/binutils/objdump.c index c184896..c7ad51e 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -4083,7 +4083,7 @@ dump_ctf_errs (ctf_file_t *fp) /* Dump accumulated errors and warnings. */ while ((errtext = ctf_errwarning_next (fp, &it, &is_warning, &err)) != NULL) { - non_fatal (_("%s: `%s'"), is_warning ? _("warning"): _("error"), + non_fatal (_("%s: %s"), is_warning ? _("warning"): _("error"), errtext); free (errtext); } diff --git a/binutils/readelf.c b/binutils/readelf.c index c5796e8..d4dcab8 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -14249,7 +14249,7 @@ dump_ctf_errs (ctf_file_t *fp) /* Dump accumulated errors and warnings. */ while ((errtext = ctf_errwarning_next (fp, &it, &is_warning, &err)) != NULL) { - error (_("%s: `%s'"), is_warning ? _("warning"): _("error"), + error (_("%s: %s"), is_warning ? _("warning"): _("error"), errtext); free (errtext); } -- cgit v1.1