This is the mail archive of the elfutils-devel@sourceware.org mailing list for the elfutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[COMMITTED] readelf: Lookup "no" translation for no_str, not "yes".


On irc Tom pointed out that no was yes... oops.
Committed as obvious.

Also use yes_str and no_str in print_debug_abbrev_section
and print_form_data.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 src/ChangeLog | 6 ++++++
 src/readelf.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 37e24714..d6fc919a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-07  Mark Wielaard  <mark@klomp.org>
+
+	* readelf.c (main): Lookup "no" for no_str.
+	(print_debug_abbrev_section): Use yes_str and no_str.
+	(print_form_data): Likewise.
+
 2018-06-04  Mark Wielaard  <mark@klomp.org>
 
 	* readelf (format_result): New static char pointer.
diff --git a/src/readelf.c b/src/readelf.c
index 8f37f17b..6ac45111 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -327,7 +327,7 @@ main (int argc, char *argv[])
 
   /* Look up once.  */
   yes_str = gettext ("yes");
-  no_str = gettext ("yes");
+  no_str = gettext ("no");
 
   /* Parse and process arguments.  */
   int remaining;
@@ -5062,7 +5062,7 @@ print_debug_abbrev_section (Dwfl_Module *dwflmod __attribute__ ((unused)),
 	  printf (gettext (" [%5u] offset: %" PRId64
 			   ", children: %s, tag: %s\n"),
 		  code, (int64_t) offset,
-		  has_children ? gettext ("yes") : gettext ("no"),
+		  has_children ? yes_str : no_str,
 		  dwarf_tag_name (tag));
 
 	  size_t cnt = 0;
@@ -7955,7 +7955,7 @@ print_form_data (Dwarf *dbg, int form, const unsigned char *readp,
       if (readendp - readp < 1)
 	goto invalid_data;
       val = *readp++;
-      printf ("%s", val != 0 ? gettext ("yes") : gettext ("no"));
+      printf ("%s", val != 0 ? yes_str : no_str);
       break;
 
     case DW_FORM_string:
-- 
2.17.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]