commit 478d002e4c60c4369af35bf77da2ec64bae78649
author David Srbecky <dsrbecky@google.com> Tue Jun 09 00:51:28 2015 +0100
committer David Srbecky <dsrbecky@google.com> Tue Jun 09 00:57:59 2015 +0100
tree 5fc53b54c010b1bc04bf8503035e9c11ef95dfaa
parent 1a77b51057b5073b3bdda80fbaecc9b4ca639385

Change return type of get_load_offset to bool.

Return boolean value to indicate success and return the offset via pointer.
Offset of 0 zero is valid if the elf file was not relocated.

Change-Id: Ia9c73673a4ecbdc1f21324b6e0f414d4daf8359d

src/elfxx.c

diff --git a/src/elfxx.c b/src/elfxx.c
index ec30239..6676d0c 100644
--- a/src/elfxx.c
+++ b/src/elfxx.c
@@ -386,18 +386,19 @@
   return false;
 }
 
-static Elf_W(Addr) elf_w (get_load_offset_mapped) (
-    struct elf_image *ei, unsigned long segbase, unsigned long mapoff) {
+static bool elf_w (get_load_offset_mapped) (
+    struct elf_image *ei, unsigned long segbase, unsigned long mapoff, Elf_W(Addr)* load_offset) {
   Elf_W(Ehdr) *ehdr = ei->u.mapped.image;
   Elf_W(Phdr) *phdr = (Elf_W(Phdr) *) ((char *) ei->u.mapped.image + ehdr->e_phoff);
 
   int i;
   for (i = 0; i < ehdr->e_phnum; ++i) {
     if (phdr[i].p_type == PT_LOAD && phdr[i].p_offset == mapoff) {
-      return segbase - phdr[i].p_vaddr;
+      *load_offset = segbase - phdr[i].p_vaddr;
+      return true;
     }
   }
-  return 0;
+  return false;
 }
 
 // --------------------------------------------------------------------------
@@ -423,17 +424,14 @@
   }
 }
 
-static Elf_W(Addr) elf_w (get_load_offset) (
-    struct elf_image* ei, unsigned long segbase, unsigned long mapoff, Elf_W(Ehdr)* ehdr) {
+static bool elf_w (get_load_offset) (
+    struct elf_image* ei, unsigned long segbase, unsigned long mapoff,
+    Elf_W(Ehdr)* ehdr, Elf_W(Addr)* load_offset) {
   if (ei->mapped) {
-    return elf_w (get_load_offset_mapped) (ei, segbase, mapoff);
+    return elf_w (get_load_offset_mapped) (ei, segbase, mapoff, load_offset);
   } else {
-    Elf_W(Addr) load_offset;
-    if (elf_w (get_load_offset_memory) (ei, segbase, mapoff, ehdr, &load_offset)) {
-      return load_offset;
-    }
+    return elf_w (get_load_offset_memory) (ei, segbase, mapoff, ehdr, load_offset);
   }
-  return 0;
 }
 
 #if HAVE_LZMA
@@ -557,8 +555,8 @@
     unw_word_t ip, char* buf, size_t buf_len, unw_word_t* offp) {
   Elf_W(Ehdr) ehdr;
   memset(&ehdr, 0, sizeof(ehdr));
-  Elf_W(Addr) load_offset = elf_w (get_load_offset) (ei, segbase, mapoff, &ehdr);
-  if (load_offset == 0) {
+  Elf_W(Addr) load_offset;
+  if (!elf_w (get_load_offset) (ei, segbase, mapoff, &ehdr, &load_offset)) {
     return false;
   }
 
@@ -570,8 +568,7 @@
   // the MiniDebugInfo.
   struct elf_image mdi;
   if (elf_w (extract_minidebuginfo) (ei, &mdi, &ehdr)) {
-    load_offset = elf_w (get_load_offset) (&mdi, segbase, mapoff, &ehdr);
-    if (load_offset == 0) {
+    if (!elf_w (get_load_offset) (&mdi, segbase, mapoff, &ehdr, &load_offset)) {
       return false;
     }
     if (elf_w (lookup_symbol) (as, ip, &mdi, load_offset, buf, buf_len, offp, &ehdr)) {