From: Petr Machata <pmachata@redhat.com>
Date: Tue, 5 May 2009 12:32:39 +0000 (+0200)
Subject: Rename __libdw_read_udata_addr to __libdw_formptr
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=335075596b6acef6e59919155e2b087e690a572d;p=thirdparty%2Felfutils.git

Rename __libdw_read_udata_addr to __libdw_formptr
---

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index abea245a0..ec32c2d81 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,6 +1,6 @@
 2009-05-05  Petr Machata  <pmachata@redhat.com>
 
-	* libdwP.h (__libdw_read_udata_addr): Declare new function.
+	* libdwP.h (__libdw_formptr): Declare new function.
 	* dwarf_formudata.c: Implement it here.
 	* dwarf_getlocation.c (dwarf_getlocation_addr):
 	Call it instead of hand-rolled offset handling code.
diff --git a/libdw/dwarf_formudata.c b/libdw/dwarf_formudata.c
index 71a5e967f..a0aa516cb 100644
--- a/libdw/dwarf_formudata.c
+++ b/libdw/dwarf_formudata.c
@@ -56,8 +56,8 @@
 #include "libdwP.h"
 
 internal_function unsigned char *
-__libdw_read_udata_addr (Dwarf_Attribute *attr, int sec_index,
-			 int err_nodata, unsigned char **endpp)
+__libdw_formptr (Dwarf_Attribute *attr, int sec_index,
+		 int err_nodata, unsigned char **endpp)
 {
   if (attr == NULL)
     return NULL;
diff --git a/libdw/dwarf_getlocation.c b/libdw/dwarf_getlocation.c
index 3480f3ddc..83da7cdf2 100644
--- a/libdw/dwarf_getlocation.c
+++ b/libdw/dwarf_getlocation.c
@@ -379,8 +379,8 @@ dwarf_getlocation_addr (attr, address, llbufs, listlens, maxlocs)
     }
 
   unsigned char *endp, *readp
-    = __libdw_read_udata_addr (attr, IDX_debug_loc,
-			       DWARF_E_NO_LOCLIST, &endp);
+    = __libdw_formptr (attr, IDX_debug_loc,
+		       DWARF_E_NO_LOCLIST, &endp);
   if (readp == NULL)
     return -1;
 
diff --git a/libdw/dwarf_getsrclines.c b/libdw/dwarf_getsrclines.c
index df510e1dd..bc36e8b2f 100644
--- a/libdw/dwarf_getsrclines.c
+++ b/libdw/dwarf_getsrclines.c
@@ -136,9 +136,9 @@ dwarf_getsrclines (Dwarf_Die *cudie, Dwarf_Lines **lines, size_t *nlines)
       /* Get the offset into the .debug_line section.  NB: this call
 	 also checks whether the previous dwarf_attr call failed.  */
       const unsigned char *lineendp, *linep
-	= __libdw_read_udata_addr (stmt_list, IDX_debug_line,
-				   DWARF_E_NO_DEBUG_LINE,
-				   (unsigned char **) &lineendp);
+	= __libdw_formptr (stmt_list, IDX_debug_line,
+			   DWARF_E_NO_DEBUG_LINE,
+			   (unsigned char **) &lineendp);
       if (linep == NULL)
 	goto out;
 
diff --git a/libdw/dwarf_ranges.c b/libdw/dwarf_ranges.c
index 875068cb4..d49c6ab9d 100644
--- a/libdw/dwarf_ranges.c
+++ b/libdw/dwarf_ranges.c
@@ -139,9 +139,9 @@ dwarf_ranges (Dwarf_Die *die, ptrdiff_t offset, Dwarf_Addr *basep,
 	/* No PC attributes in this DIE at all, so an empty range list.  */
 	return 0;
 
-      if ((readp = __libdw_read_udata_addr (attr, IDX_debug_ranges,
-					    DWARF_E_NO_DEBUG_RANGES,
-					    &readendp)) == NULL)
+      if ((readp = __libdw_formptr (attr, IDX_debug_ranges,
+				    DWARF_E_NO_DEBUG_RANGES,
+				    &readendp)) == NULL)
 	return -1;
 
       Dwarf_Word start_offset = (void *) readp - d->d_buf;
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 16b19c6f7..85b1398d7 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -511,8 +511,8 @@ __libdw_read_begin_end_pair_inc (Dwarf *dbg, int sec_index,
   internal_function;
 
 unsigned char *
-__libdw_read_udata_addr (Dwarf_Attribute *attr, int sec_index,
-			 int err_nodata, unsigned char **endpp)
+__libdw_formptr (Dwarf_Attribute *attr, int sec_index,
+		 int err_nodata, unsigned char **endpp)
   internal_function;
 
 static inline int