diff options
| author | Thomas White <taw@physics.org> | 2010-06-12 22:52:35 -0700 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2010-06-12 22:52:35 -0700 |
| commit | c97cffdba46d5583de626540f1179acaf61c01c5 (patch) | |
| tree | c7c57cbdb97cff3cf0dac19ca70008ef21006223 /src | |
| parent | ef41d78fe460d939dc180c97d95d6ee880a7e3e5 (diff) | |
calibrate_detector: Don't attempt to return a value
Diffstat (limited to 'src')
| -rw-r--r-- | src/calibrate-detector.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/calibrate-detector.c b/src/calibrate-detector.c index 4c4f5c33..1d5292f7 100644 --- a/src/calibrate-detector.c +++ b/src/calibrate-detector.c @@ -309,7 +309,6 @@ int main(int argc, char *argv[]) char line[1024]; int r; - struct process_result *result = NULL; struct timespec t; struct timeval tv; struct process_args *pargs; @@ -322,8 +321,7 @@ int main(int argc, char *argv[]) t.tv_sec = tv.tv_sec; t.tv_nsec = tv.tv_usec * 1000 + 20000; - r = pthread_timedjoin_np(workers[i], (void *)&result, - &t); + r = pthread_timedjoin_np(workers[i], NULL, &t); if ( r != 0 ) continue; /* Not ready yet */ worker_active[i] = 0; @@ -334,8 +332,7 @@ int main(int argc, char *argv[]) snprintf(pargs->filename, 1023, "%s%s", prefix, line); worker_active[i] = 1; - r = pthread_create(&workers[i], NULL, process_image, - pargs); + r = pthread_create(&workers[i], NULL, process_image, pargs); if ( r != 0 ) { worker_active[i] = 0; ERROR("Couldn't start thread %i\n", i); @@ -350,11 +347,9 @@ int main(int argc, char *argv[]) /* Catch all remaining threads */ for ( i=0; i<nthreads; i++ ) { - struct process_result *result = NULL; - if ( !worker_active[i] ) goto free; - pthread_join(workers[i], (void *)&result); + pthread_join(workers[i], NULL); worker_active[i] = 0; |