From ea4ea50f064c5468142b24627acad09a41f060cb Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 30 May 2018 12:38:16 +0300 Subject: 9565 ctf: cast between incompatible function types Reviewed by: Yuri Pankov Reviewed by: Andrew Stormont Reviewed by: John Levon Approved by: Hans Rosenfeld --- usr/src/tools/ctf/cvt/ctfmerge.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'usr/src/tools/ctf/cvt/ctfmerge.c') diff --git a/usr/src/tools/ctf/cvt/ctfmerge.c b/usr/src/tools/ctf/cvt/ctfmerge.c index 5706cceb17..1d6d751d99 100644 --- a/usr/src/tools/ctf/cvt/ctfmerge.c +++ b/usr/src/tools/ctf/cvt/ctfmerge.c @@ -504,9 +504,11 @@ worker_runphase2(workqueue_t *wq) /* * Main loop for worker threads. */ -static void -worker_thread(workqueue_t *wq) +static void * +worker_thread(void *ptr) { + workqueue_t *wq = ptr; + worker_runphase1(wq); debug(2, "%d: entering first barrier\n", pthread_self()); @@ -530,6 +532,7 @@ worker_thread(workqueue_t *wq) debug(2, "%d: phase 1 complete\n", pthread_self()); worker_runphase2(wq); + return (NULL); } /* @@ -692,7 +695,7 @@ start_threads(workqueue_t *wq) for (i = 0; i < wq->wq_nthreads; i++) { pthread_create(&wq->wq_thread[i], NULL, - (void *(*)(void *))worker_thread, wq); + worker_thread, wq); } sigset(SIGINT, handle_sig); -- cgit v1.2.3