提交 15a91446 编写于 作者: D Daniel P. Berrange

Fix errno handling for pthreads wrappers

* src/util/threads-pthread.c: pthreads APIs do not set errno, instead
  the return value is the positive errno. Set errno based on the return
  value in the wrappers
上级 dd9e9c3b
...@@ -35,8 +35,9 @@ void virThreadOnExit(void) ...@@ -35,8 +35,9 @@ void virThreadOnExit(void)
int virMutexInit(virMutexPtr m) int virMutexInit(virMutexPtr m)
{ {
if (pthread_mutex_init(&m->lock, NULL) != 0) { int ret;
errno = EINVAL; if ((ret = pthread_mutex_init(&m->lock, NULL)) != 0) {
errno = ret;
return -1; return -1;
} }
return 0; return 0;
...@@ -57,11 +58,11 @@ void virMutexUnlock(virMutexPtr m) ...@@ -57,11 +58,11 @@ void virMutexUnlock(virMutexPtr m)
} }
int virCondInit(virCondPtr c) int virCondInit(virCondPtr c)
{ {
if (pthread_cond_init(&c->cond, NULL) != 0) { int ret;
errno = EINVAL; if ((ret = pthread_cond_init(&c->cond, NULL)) != 0) {
errno = ret;
return -1; return -1;
} }
return 0; return 0;
...@@ -69,8 +70,9 @@ int virCondInit(virCondPtr c) ...@@ -69,8 +70,9 @@ int virCondInit(virCondPtr c)
int virCondDestroy(virCondPtr c) int virCondDestroy(virCondPtr c)
{ {
if (pthread_cond_destroy(&c->cond) != 0) { int ret;
errno = EINVAL; if ((ret = pthread_cond_destroy(&c->cond)) != 0) {
errno = ret;
return -1; return -1;
} }
return 0; return 0;
...@@ -78,8 +80,9 @@ int virCondDestroy(virCondPtr c) ...@@ -78,8 +80,9 @@ int virCondDestroy(virCondPtr c)
int virCondWait(virCondPtr c, virMutexPtr m) int virCondWait(virCondPtr c, virMutexPtr m)
{ {
if (pthread_cond_wait(&c->cond, &m->lock) != 0) { int ret;
errno = EINVAL; if ((ret = pthread_cond_wait(&c->cond, &m->lock)) != 0) {
errno = ret;
return -1; return -1;
} }
return 0; return 0;
...@@ -99,8 +102,9 @@ void virCondBroadcast(virCondPtr c) ...@@ -99,8 +102,9 @@ void virCondBroadcast(virCondPtr c)
int virThreadLocalInit(virThreadLocalPtr l, int virThreadLocalInit(virThreadLocalPtr l,
virThreadLocalCleanup c) virThreadLocalCleanup c)
{ {
if (pthread_key_create(&l->key, c) != 0) { int ret;
errno = EINVAL; if ((ret = pthread_key_create(&l->key, c)) != 0) {
errno = ret;
return -1; return -1;
} }
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册