From cacbc41c45bd4f94141125de059ab91a6cd08bc4 Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Wed, 24 Dec 2014 11:11:42 +0000 Subject: [PATCH] Fix a few casts. A void * cannot be used to initialise a function pointer. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14831 --- coregrind/m_scheduler/scheduler.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c index 2e1184adde..78369b3a7f 100644 --- a/coregrind/m_scheduler/scheduler.c +++ b/coregrind/m_scheduler/scheduler.c @@ -1823,7 +1823,7 @@ void do_client_request ( ThreadId tid ) switch (req_no) { case VG_USERREQ__CLIENT_CALL0: { - UWord (*f)(ThreadId) = (void*)arg[1]; + UWord (*f)(ThreadId) = (__typeof__(f))arg[1]; if (f == NULL) VG_(message)(Vg_DebugMsg, "VG_USERREQ__CLIENT_CALL0: func=%p\n", f); else @@ -1831,7 +1831,7 @@ void do_client_request ( ThreadId tid ) break; } case VG_USERREQ__CLIENT_CALL1: { - UWord (*f)(ThreadId, UWord) = (void*)arg[1]; + UWord (*f)(ThreadId, UWord) = (__typeof__(f))arg[1]; if (f == NULL) VG_(message)(Vg_DebugMsg, "VG_USERREQ__CLIENT_CALL1: func=%p\n", f); else @@ -1839,7 +1839,7 @@ void do_client_request ( ThreadId tid ) break; } case VG_USERREQ__CLIENT_CALL2: { - UWord (*f)(ThreadId, UWord, UWord) = (void*)arg[1]; + UWord (*f)(ThreadId, UWord, UWord) = (__typeof__(f))arg[1]; if (f == NULL) VG_(message)(Vg_DebugMsg, "VG_USERREQ__CLIENT_CALL2: func=%p\n", f); else @@ -1847,7 +1847,7 @@ void do_client_request ( ThreadId tid ) break; } case VG_USERREQ__CLIENT_CALL3: { - UWord (*f)(ThreadId, UWord, UWord, UWord) = (void*)arg[1]; + UWord (*f)(ThreadId, UWord, UWord, UWord) = (__typeof__(f))arg[1]; if (f == NULL) VG_(message)(Vg_DebugMsg, "VG_USERREQ__CLIENT_CALL3: func=%p\n", f); else -- 2.47.3