From: Mark Wielaard Date: Mon, 1 Jan 2018 21:39:24 +0000 (+0100) Subject: readelf: Use dwarf_form_name for printing (unknown) forms. X-Git-Tag: elfutils-0.171~88 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68cd423edbba61af902eed2abe85578f1c134a25;p=thirdparty%2Felfutils.git readelf: Use dwarf_form_name for printing (unknown) forms. 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 --- diff --git a/src/ChangeLog b/src/ChangeLog index 9d6ec8304..49b0cc036 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 ee9c7e1d7..4bdaef204 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