Simplify ordering code as suggested in PR comments.

NixOS · Jan 8, 2018 · 71e99c5 · 71e99c5
1 parent a1eab1c
commit 71e99c5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -135,12 +135,12 @@ class ElfFile
         ElfFile * elfFile;
         bool operator ()(const Elf_Phdr & x, const Elf_Phdr & y)
         {
-            if (x.p_type == PT_PHDR) {
-                  if (y.p_type == PT_PHDR) return false;
-                  return true;
-            }
-            if (y.p_type == PT_PHDR) return false;
-            return elfFile->rdi(x.p_paddr) < elfFile->rdi(y.p_paddr);
+          // A PHDR comes before everything else.
+          if (y.p_type == PT_PHDR) return false;
+          if (x.p_type == PT_PHDR) return true;
+
+          // Sort non-PHDRs by address.
+          return elfFile->rdi(x.p_paddr) < elfFile->rdi(y.p_paddr);
         }
     };