Fix a few function declarations.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15514

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index 324a96d53ae916f41edb2db95715e2c34b202fd1..8097f16a4e785877a36f4fa9a133bd5b3c402ca2 100644 (file)
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -3666,8 +3666,8 @@ Bool consider_vars_in_frame ( /*MOD*/XArray* /* of HChar */ dname1,
    XArray itself.
 */
 Bool VG_(get_data_description)( 
-        /*MOD*/ void* /* really, XArray* of HChar */ dname1v,
-        /*MOD*/ void* /* really, XArray* of HChar */ dname2v,
+        /*MOD*/ XArray* /* of HChar */ dname1,
+        /*MOD*/ XArray* /* of HChar */ dname2,
         Addr data_addr
      )
 {
@@ -3681,9 +3681,6 @@ Bool VG_(get_data_description)(
    DebugInfo* di;
    Word       j;
 
-   XArray*    dname1 = (XArray*)dname1v;
-   XArray*    dname2 = (XArray*)dname2v;
-
    if (0) VG_(printf)("get_data_description: dataaddr %#lx\n", data_addr);
    /* First, see if data_addr is (or is part of) a global variable.
       Loop over the DebugInfos we have.  Check data_addr against the
@@ -3978,8 +3975,8 @@ void analyse_deps ( /*MOD*/XArray* /* of FrameBlock */ blocks,
    point.  If 'arrays_only' is True, only array-typed blocks are
    returned; otherwise blocks of all types are returned. */
 
-void* /* really, XArray* of StackBlock */
-      VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only )
+XArray* /* of StackBlock */
+VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only )
 {
    /* This is a derivation of consider_vars_in_frame() above. */
    Word       i;
@@ -4092,9 +4089,8 @@ void* /* really, XArray* of StackBlock */
    array-typed blocks are returned; otherwise blocks of all types are
    returned. */
 
-void* /* really, XArray* of GlobalBlock */
-      VG_(di_get_global_blocks_from_dihandle) ( ULong di_handle,
-                                                Bool  arrays_only )
+XArray* /* of GlobalBlock */
+VG_(di_get_global_blocks_from_dihandle) ( ULong di_handle, Bool  arrays_only )
 {
    /* This is a derivation of consider_vars_in_frame() above. */
 

diff --git a/include/pub_tool_debuginfo.h b/include/pub_tool_debuginfo.h
index 91f375178f94c1035ccc4c7f33009f2c91bd8b33..f6c48ce168f4938683a22ac1cccedcf96c464b0f 100644 (file)
--- a/include/pub_tool_debuginfo.h
+++ b/include/pub_tool_debuginfo.h
@@ -32,6 +32,7 @@
 #define __PUB_TOOL_DEBUGINFO_H
 
 #include "pub_tool_basics.h"   // VG_ macro
+#include "pub_tool_xarray.h"   // XArray
 
 /*====================================================================*/
 /*=== Obtaining debug information                                  ===*/
@@ -113,8 +114,8 @@ extern Bool VG_(get_datasym_and_offset)( Addr data_addr,
    XArray itself.
 */
 Bool VG_(get_data_description)( 
-        /*MOD*/ void* /* really, XArray* of HChar */ dname1v,
-        /*MOD*/ void* /* really, XArray* of HChar */ dname2v,
+        /*MOD*/ XArray* /* of HChar */ dname1v,
+        /*MOD*/ XArray* /* of HChar */ dname2v,
         Addr data_addr
      );
 
@@ -178,8 +179,8 @@ typedef
    }
    StackBlock;
 
-extern void* /* really, XArray* of StackBlock */
-             VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only );
+extern XArray* /* of StackBlock */
+VG_(di_get_stack_blocks_at_ip)( Addr ip, Bool arrays_only );
 
 
 /* Get an array of GlobalBlock which describe the global blocks owned
@@ -199,7 +200,7 @@ typedef
    }
    GlobalBlock;
 
-extern void* /* really, XArray* of GlobalBlock */
+extern XArray* /* of GlobalBlock */
 VG_(di_get_global_blocks_from_dihandle) ( ULong di_handle,
                                           Bool  arrays_only );