diff options
| author | John Birrell <jb@FreeBSD.org> | 1998-06-25 00:04:21 +0000 |
|---|---|---|
| committer | John Birrell <jb@FreeBSD.org> | 1998-06-25 00:04:21 +0000 |
| commit | ff09ba5fbbb957ac8c4ee21ae02b3900b68b8381 (patch) | |
| tree | 6fcc099ad961308eb1b8470d11258afd0c4a28d6 /lib | |
| parent | e2c597dd6ab5ba92fce3e3bb8bf803fbc88910e9 (diff) | |
| download | src-ff09ba5fbbb957ac8c4ee21ae02b3900b68b8381.tar.gz src-ff09ba5fbbb957ac8c4ee21ae02b3900b68b8381.zip | |
Add the missing {} that caused the function to return ESRCH if it
had to wait for the thread to exit and if the caller didn't want the
thread exit status.
Notes
Notes:
svn path=/head/; revision=37146
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc_r/uthread/uthread_join.c | 3 | ||||
| -rw-r--r-- | lib/libkse/thread/thr_join.c | 3 | ||||
| -rw-r--r-- | lib/libpthread/thread/thr_join.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c index 83b0c2a8c0de..2043b76f5d24 100644 --- a/lib/libc_r/uthread/uthread_join.c +++ b/lib/libc_r/uthread/uthread_join.c @@ -77,11 +77,12 @@ pthread_join(pthread_t pthread, void **thread_return) _thread_kern_sched_state(PS_JOIN, __FILE__, __LINE__); /* Check if the thread is not detached: */ - if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) + if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) { /* Check if the return value is required: */ if (thread_return) /* Return the thread's return value: */ *thread_return = pthread->ret; + } else /* Return an error: */ ret = ESRCH; diff --git a/lib/libkse/thread/thr_join.c b/lib/libkse/thread/thr_join.c index 83b0c2a8c0de..2043b76f5d24 100644 --- a/lib/libkse/thread/thr_join.c +++ b/lib/libkse/thread/thr_join.c @@ -77,11 +77,12 @@ pthread_join(pthread_t pthread, void **thread_return) _thread_kern_sched_state(PS_JOIN, __FILE__, __LINE__); /* Check if the thread is not detached: */ - if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) + if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) { /* Check if the return value is required: */ if (thread_return) /* Return the thread's return value: */ *thread_return = pthread->ret; + } else /* Return an error: */ ret = ESRCH; diff --git a/lib/libpthread/thread/thr_join.c b/lib/libpthread/thread/thr_join.c index 83b0c2a8c0de..2043b76f5d24 100644 --- a/lib/libpthread/thread/thr_join.c +++ b/lib/libpthread/thread/thr_join.c @@ -77,11 +77,12 @@ pthread_join(pthread_t pthread, void **thread_return) _thread_kern_sched_state(PS_JOIN, __FILE__, __LINE__); /* Check if the thread is not detached: */ - if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) + if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) { /* Check if the return value is required: */ if (thread_return) /* Return the thread's return value: */ *thread_return = pthread->ret; + } else /* Return an error: */ ret = ESRCH; |