unstrip: Pull check_match() into file scope

Get rid of a nested function this way.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index ea8250c5b6d4a334b08840661f178fe613e7dfbe..9e7d6cb9b613c9a40182979514b7e841013f1d3b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2021-02-17  Timm Bäder  <tbaeder@redhat.com>
+
+       * unstrip.c (find_alloc_sections_prelink): Move check_match to...
+       (check_match): Adjusted to return whether there was no match,
+       which indicates a failure. So callers are adjusted to or the
+       result into a local fail boolean.
+
 2021-02-17  Timm Bäder  <tbaeder@redhat.com>
 
        * unstrip.c (adjust_relocs): Move adjust_reloc function to...

diff --git a/src/unstrip.c b/src/unstrip.c
index 6e874c3aa79092dba9cfbb6e56d0192093f1f6fa..72fabac8e8bbdf82b43ac8c616c9d412bf5fc46d 100644 (file)
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -1065,6 +1065,20 @@ get_group_sig (Elf *elf, GElf_Shdr *shdr)
   return sig;
 }
 
+static inline bool
+check_match (bool match, Elf_Scn *scn, const char *name)
+{
+  if (!match)
+    {
+      error (0, 0, _("cannot find matching section for [%zu] '%s'"),
+            elf_ndxscn (scn), name);
+      return true;
+    }
+
+  return false;
+}
+
+
 /* Fix things up when prelink has moved some allocated sections around
    and the debuginfo file's section headers no longer match up.
    This fills in SECTIONS[0..NALLOC-1].outscn or exits.
@@ -1200,16 +1214,6 @@ find_alloc_sections_prelink (Elf *debug, Elf_Data *debug_shstrtab,
     }
 
   bool fail = false;
-  inline void check_match (bool match, Elf_Scn *scn, const char *name)
-    {
-      if (!match)
-       {
-         fail = true;
-         error (0, 0, _("cannot find matching section for [%zu] '%s'"),
-                elf_ndxscn (scn), name);
-       }
-    }
-
   Elf_Scn *scn = NULL;
   while ((scn = elf_nextscn (debug, scn)) != NULL)
     {
@@ -1240,7 +1244,7 @@ find_alloc_sections_prelink (Elf *debug, Elf_Data *debug_shstrtab,
       for (size_t i = 0; shdr != NULL && i < nalloc; ++i)
        if (sections[i].outscn == scn)
          shdr = NULL;
-      check_match (shdr == NULL, scn, name);
+      fail |= check_match (shdr == NULL, scn, name);
     }
 
   if (fail)
@@ -1296,7 +1300,7 @@ find_alloc_sections_prelink (Elf *debug, Elf_Data *debug_shstrtab,
            }
        }
 
-      check_match (undo_sec == NULL, scn, name);
+      fail |= check_match (undo_sec == NULL, scn, name);
     }
 
   free (undo_sections);