Followup to r11619: more tidying up w.r.t. the renaming of

'struct _Thr :: opaque' to 'struct _Thr :: hgthread'.

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

diff --git a/helgrind/libhb.h b/helgrind/libhb.h
index 39711b52e485309f8be925de02b4179364ef47f6..ea8fcb25620cdd53cc65bad7edc54061a8dc67c4 100644 (file)
--- a/helgrind/libhb.h
+++ b/helgrind/libhb.h
@@ -131,8 +131,8 @@ void libhb_srange_untrack  ( Thr*, Addr, SizeT );
 
 /* Get and set the hgthread (pointer to corresponding Thread
    structure). */
-void* libhb_get_Thr_hgthread ( Thr* );
-void  libhb_set_Thr_hgthread ( Thr*, void* );
+Thread* libhb_get_Thr_hgthread ( Thr* );
+void    libhb_set_Thr_hgthread ( Thr*, Thread* );
 
 /* Low level copy of shadow state from [src,src+len) to [dst,dst+len).
    Overlapping moves are checked for and asserted against. */

diff --git a/helgrind/libhb_core.c b/helgrind/libhb_core.c
index 05fda56a3e4b966d96c710e293ef5feec3587dc9..566ee65053fd87ba2f0e6a1ddecb9b0e65bc1a7e 100644 (file)
--- a/helgrind/libhb_core.c
+++ b/helgrind/libhb_core.c
@@ -5980,14 +5980,14 @@ void libhb_srange_untrack ( Thr* thr, Addr a, SizeT szB )
    if (0 && TRACEME(a,szB)) trace(thr,a,szB,"untrack-after ");
 }
 
-void* libhb_get_Thr_hgthread ( Thr* thr ) {
+Thread* libhb_get_Thr_hgthread ( Thr* thr ) {
    tl_assert(thr);
    return thr->hgthread;
 }
 
-void libhb_set_Thr_hgthread ( Thr* thr, void* v ) {
+void libhb_set_Thr_hgthread ( Thr* thr, Thread* hgthread ) {
    tl_assert(thr);
-   thr->hgthread = v;
+   thr->hgthread = hgthread;
 }
 
 void libhb_copy_shadow_state ( Thr* thr, Addr src, Addr dst, SizeT len )