From 5a535f9fac3f4b82f0b154b4c81fd1e2a8d62802 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 3 Apr 2011 21:30:15 -0400 Subject: Don't use awkward (*fptr)() syntax. --- libdimension/threads.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libdimension/threads.c') diff --git a/libdimension/threads.c b/libdimension/threads.c index eb5e0aa..00f0e33 100644 --- a/libdimension/threads.c +++ b/libdimension/threads.c @@ -51,9 +51,9 @@ dmnsn_thread(void *arg) dmnsn_thread_payload *payload = arg; int *ret; - pthread_cleanup_push(&dmnsn_thread_cleanup, payload); + pthread_cleanup_push(dmnsn_thread_cleanup, payload); ret = dmnsn_malloc(sizeof(int)); - *ret = (*payload->thread_fn)(payload->arg); + *ret = payload->thread_fn(payload->arg); pthread_cleanup_pop(1); return ret; } @@ -67,7 +67,7 @@ dmnsn_new_thread(dmnsn_progress *progress, dmnsn_thread_fn *thread_fn, payload->arg = arg; payload->progress = progress; - if (pthread_create(&progress->thread, NULL, &dmnsn_thread, payload) != 0) { + if (pthread_create(&progress->thread, NULL, dmnsn_thread, payload) != 0) { dmnsn_error("Couldn't start thread."); } } @@ -84,8 +84,8 @@ static void * dmnsn_concurrent_thread(void *ptr) { dmnsn_concurrent_thread_payload *payload = ptr; - payload->ret = (*payload->thread_fn)(payload->arg, payload->thread, - payload->nthreads); + payload->ret = payload->thread_fn(payload->arg, payload->thread, + payload->nthreads); return NULL; } @@ -102,7 +102,7 @@ dmnsn_execute_concurrently(dmnsn_concurrent_thread_fn *thread_fn, payloads[i].thread = i; payloads[i].nthreads = nthreads; payloads[i].ret = -1; - if (pthread_create(&threads[i], NULL, &dmnsn_concurrent_thread, + if (pthread_create(&threads[i], NULL, dmnsn_concurrent_thread, &payloads[i]) != 0) { dmnsn_error("Couldn't start worker thread."); -- cgit v1.2.3