addr2line: Pull show_note() and show_int() in file scope

Get rid of the nested functions

Signed-off-by: Timm Bäder <tbaeder@redhat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 4fc54ce7bb1ad1914db54e8174f01cd07f2e8a14..63bf749533465eb58899d8fb753503f55cc1826a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2021-01-08  Timm Bäder  <tbaeder@redhat.com>
+
+       * addr2line.c (handle_address): Move show_note and show_int up to
+       file scope.
+       (show_note: New static inline function.
+       (show_int): Likewise.
+
 2021-01-08  Timm Bäder  <tbaeder@redhat.com>
 
        * strip.c (handle_elf): Remove no_symtab_updates function and

diff --git a/src/addr2line.c b/src/addr2line.c
index ea01c1be855c2bdc0e926eda9407ad751dc8d6d8..349450469bdd7a5dfa6e096ef27774e03a428829 100644 (file)
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -598,6 +598,26 @@ get_addr_width (Dwfl_Module *mod)
   return width;
 }
 
+static inline void
+show_note (int (*get) (Dwarf_Line *, bool *),
+          Dwarf_Line *info,
+          const char *note)
+{
+  bool flag;
+  if ((*get) (info, &flag) == 0 && flag)
+    fputs (note, stdout);
+}
+
+static inline void
+show_int (int (*get) (Dwarf_Line *, unsigned int *),
+         Dwarf_Line *info,
+         const char *name)
+{
+  unsigned int val;
+  if ((*get) (info, &val) == 0 && val != 0)
+    printf (" (%s %u)", name, val);
+}
+
 static int
 handle_address (const char *string, Dwfl *dwfl)
 {
@@ -692,27 +712,12 @@ handle_address (const char *string, Dwfl *dwfl)
          Dwarf_Line *info = dwfl_dwarf_line (line, &bias);
          assert (info != NULL);
 
-         inline void show (int (*get) (Dwarf_Line *, bool *),
-                           const char *note)
-         {
-           bool flag;
-           if ((*get) (info, &flag) == 0 && flag)
-             fputs (note, stdout);
-         }
-         inline void show_int (int (*get) (Dwarf_Line *, unsigned int *),
-                               const char *name)
-         {
-           unsigned int val;
-           if ((*get) (info, &val) == 0 && val != 0)
-             printf (" (%s %u)", name, val);
-         }
-
-         show (&dwarf_linebeginstatement, " (is_stmt)");
-         show (&dwarf_lineblock, " (basic_block)");
-         show (&dwarf_lineprologueend, " (prologue_end)");
-         show (&dwarf_lineepiloguebegin, " (epilogue_begin)");
-         show_int (&dwarf_lineisa, "isa");
-         show_int (&dwarf_linediscriminator, "discriminator");
+         show_note (&dwarf_linebeginstatement, info, " (is_stmt)");
+         show_note (&dwarf_lineblock, info, " (basic_block)");
+         show_note (&dwarf_lineprologueend, info, " (prologue_end)");
+         show_note (&dwarf_lineepiloguebegin, info, " (epilogue_begin)");
+         show_int (&dwarf_lineisa, info, "isa");
+         show_int (&dwarf_linediscriminator, info, "discriminator");
        }
       putchar ('\n');
     }