summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Machata <pmachata@redhat.com>2009-05-05 14:32:39 +0200
committerPetr Machata <pmachata@redhat.com>2009-05-05 14:32:39 +0200
commit335075596b6acef6e59919155e2b087e690a572d (patch)
tree60365e35c3e0f5a18ed5a27b2946276714f5e478
parent8273a2adaf8cb2ee203926af2849e4f96f8a6eaf (diff)
downloadelfutils-335075596b6acef6e59919155e2b087e690a572d.tar.gz
Rename __libdw_read_udata_addr to __libdw_formptr
-rw-r--r--libdw/ChangeLog2
-rw-r--r--libdw/dwarf_formudata.c4
-rw-r--r--libdw/dwarf_getlocation.c4
-rw-r--r--libdw/dwarf_getsrclines.c6
-rw-r--r--libdw/dwarf_ranges.c6
-rw-r--r--libdw/libdwP.h4
6 files changed, 13 insertions, 13 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index abea245a..ec32c2d8 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 71a5e967..a0aa516c 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 3480f3dd..83da7cdf 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 df510e1d..bc36e8b2 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 875068cb..d49c6ab9 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 16b19c6f..85b1398d 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