[PATCH] win32: remove handling for impossible cases in win32_pthread_join
From: AZero13 <gfunni234@gmail.com>
WAIT_FAILED is the only real possible error here.
Signed-off-by: Greg Funni <gfunni234@gmail.com>
---
win32: remove handling for impossible cases in win32_pthread_join
WAIT_FAILED is the only real possible error here.Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2102%2FAZero13%2Fpatch-1-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2102/AZero13/patch-1-v1
Pull-Request: https://github.com/git/git/pull/2102
compat/win32/pthread.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c
index 58980a529c..54c43b4146 100644
--- a/compat/win32/pthread.c
+++ b/compat/win32/pthread.c
@@ -37,20 +37,14 @@ int pthread_create(pthread_t *thread, const void *attr UNUSED,
int win32_pthread_join(pthread_t *thread, void **value_ptr)
{
- DWORD result = WaitForSingleObject(thread->handle, INFINITE);
- switch (result) {
- case WAIT_OBJECT_0:
- if (value_ptr)
- *value_ptr = thread->arg;
- CloseHandle(thread->handle);
- return 0;
- case WAIT_ABANDONED:
- CloseHandle(thread->handle);
- return EINVAL;
- default:
- /* the wait failed, so do not detach */
+ if (WaitForSingleObjectEx(thread->handle, INFINITE, FALSE) == WAIT_FAILED)
return err_win_to_posix(GetLastError());
- }
+
+ if (value_ptr)
+ *value_ptr = thread->arg;
+
+ CloseHandle(thread->handle);
+ return 0;
}
pthread_t pthread_self(void)
base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
--
gitgitgadget