From: Petr Machata <pmachata@redhat.com>
Date: Tue, 28 Apr 2009 14:11:05 +0000 (+0200)
Subject: Change type of return value of offset read hooks to Dwarf_Off
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66fe03f1e489a88b89a15c9e13f9bd33db2729b1;p=thirdparty%2Felfutils.git

Change type of return value of offset read hooks to Dwarf_Off
---

diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index fb9045f06..b13323376 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -445,7 +445,7 @@ int __libdw_relocate_address (Dwarf *dbg,
 
 int __libdw_relocate_offset (Dwarf *dbg,
 			     int sec_index, uintptr_t addr,
-			     int width, Dwarf_Addr *val)
+			     int width, Dwarf_Off *val)
   internal_function;
 
 #define READ_AND_RELOCATE(RELOC_HOOK)					\
@@ -455,7 +455,7 @@ int __libdw_relocate_offset (Dwarf *dbg,
       return status;							\
 									\
     uintptr_t addr0 = (uintptr_t)*addr;					\
-    Dwarf_Addr val;							\
+    __typeof (*ret) val;						\
 									\
     if (width == 4)							\
       val = read_4ubyte_unaligned_inc (dbg, *addr);			\
@@ -483,7 +483,7 @@ __libdw_read_address_inc (Dwarf *dbg,
 static inline int
 __libdw_read_offset_inc (Dwarf *dbg,
 			 int sec_index, unsigned char **addr,
-			 int width, Dwarf_Addr *ret)
+			 int width, Dwarf_Off *ret)
 {
   READ_AND_RELOCATE (__libdw_relocate_offset)
 }
diff --git a/libdw/libdw_readhooks.c b/libdw/libdw_readhooks.c
index 20a5e1e88..404f12aa7 100644
--- a/libdw/libdw_readhooks.c
+++ b/libdw/libdw_readhooks.c
@@ -68,7 +68,7 @@ __libdw_relocate_offset (Dwarf *dbg __attribute__ ((unused)),
 			 int sec_index __attribute__ ((unused)),
 			 uintptr_t addr __attribute__ ((unused)),
 			 int width __attribute__ ((unused)),
-			 Dwarf_Addr *val __attribute__ ((unused)))
+			 Dwarf_Off *val __attribute__ ((unused)))
 {
   return 0;
 }