From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3346 invoked by alias); 1 Jan 2018 21:44:36 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 3334 invoked by uid 89); 1 Jan 2018 21:44:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-25.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: gnu.wildebeest.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 01 Jan 2018 21:44:34 +0000 Received: from stream.wildebeest.org (deer0x13.wildebeest.org [172.31.17.149]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 75849302BB39; Mon, 1 Jan 2018 22:44:31 +0100 (CET) Received: by stream.wildebeest.org (Postfix, from userid 1000) id 8F7DB10291A; Mon, 1 Jan 2018 22:44:32 +0100 (CET) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] readelf: Use dwarf_form_name for printing (unknown) forms. Date: Mon, 01 Jan 2018 21:44:00 -0000 Message-Id: <20180101214428.32001-1-mark@klomp.org> X-Mailer: git-send-email 2.14.3 X-Spam-Flag: NO X-IsSubscribed: yes X-SW-Source: 2018-q1/txt/msg00000.txt.bz2 A quick first commit of the year to make (error) output more consistent in readelf: Use dwarf_form_name consistently to print forms. attr_callback was using its own string conversion, print_debug_macro_section was using dwarf_form_string instead of dwarf_form_name. The difference between dwarf_form_string and dwarf_form_name is that the first returns NULL if the form is unknown and the second returns an hexadecimal string representation in that case. Signed-off-by: Mark Wielaard --- src/ChangeLog | 5 +++++ src/readelf.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9d6ec830..49b0cc03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2018-01-01 Mark Wielaard + + * readelf.c (attr_callback): Use dwarf_form_name for unknown forms. + (print_debug_macro_section): Print form using dwarf_form_name. + 2017-12-28 Mark Wielaard * readelf.c (print_debug_units): Print DIE offset in error message diff --git a/src/readelf.c b/src/readelf.c index ee9c7e1d..4bdaef20 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -6306,9 +6306,9 @@ attr_callback (Dwarf_Attribute *attrp, void *arg) default: if (cbargs->silent) break; - printf (" %*s%-20s (form: %#x) ???\n", + printf (" %*s%-20s (%s) ???\n", (int) (level * 2), "", dwarf_attr_name (attr), - (int) form); + dwarf_form_name (form)); break; } @@ -7552,7 +7552,7 @@ print_debug_macro_section (Dwfl_Module *dwflmod __attribute__ ((unused)), if (readp + 1 > readendp) goto invalid_data; unsigned int form = *readp++; - printf (" %s", dwarf_form_string (form)); + printf (" %s", dwarf_form_name (form)); if (form != DW_FORM_data1 && form != DW_FORM_data2 && form != DW_FORM_data4 -- 2.14.3