diff options
| author | Chris Robinson <[email protected]> | 2014-04-18 06:46:21 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-04-18 06:54:18 -0700 |
| commit | c041a99f721b6ed7723f786b32f68f6ec1863042 (patch) | |
| tree | 93fbd1999fcb14e56951b297bb0dac538c20e17d | |
| parent | b8d56190d1ab055a5d34f6ea27126098f0bd0370 (diff) | |
Simplify some error checking
| -rw-r--r-- | Alc/threads.c | 8 | ||||
| -rw-r--r-- | OpenAL32/Include/threads.h | 18 |
2 files changed, 5 insertions, 21 deletions
diff --git a/Alc/threads.c b/Alc/threads.c index d9dabec1..81db4297 100644 --- a/Alc/threads.c +++ b/Alc/threads.c @@ -447,17 +447,11 @@ void almtx_destroy(almtx_t *mtx) int almtx_timedlock(almtx_t *mtx, const struct timespec *ts) { - int ret; - - if(!mtx || !ts) - return althrd_error; - - ret = pthread_mutex_timedlock(mtx, ts); + int ret = pthread_mutex_timedlock(mtx, ts); switch(ret) { case 0: return althrd_success; case ETIMEDOUT: return althrd_timedout; - case EAGAIN: case EBUSY: return althrd_busy; } return althrd_error; diff --git a/OpenAL32/Include/threads.h b/OpenAL32/Include/threads.h index c78f6ab9..40f523fa 100644 --- a/OpenAL32/Include/threads.h +++ b/OpenAL32/Include/threads.h @@ -153,20 +153,13 @@ inline int althrd_sleep(const struct timespec *ts, struct timespec *rem) inline int almtx_lock(almtx_t *mtx) { - int ret = EINVAL; - if(mtx != NULL) - ret = pthread_mutex_lock(mtx); - switch(ret) - { - case 0: return althrd_success; - case EAGAIN: return althrd_busy; - } - return althrd_error; + if(pthread_mutex_lock(mtx) != 0) + return althrd_error; + return althrd_success; } inline int almtx_unlock(almtx_t *mtx) { - if(!mtx) return althrd_error; if(pthread_mutex_unlock(mtx) != 0) return althrd_error; return althrd_success; @@ -174,13 +167,10 @@ inline int almtx_unlock(almtx_t *mtx) inline int almtx_trylock(almtx_t *mtx) { - int ret = EINVAL; - if(mtx != NULL) - ret = pthread_mutex_trylock(mtx); + int ret = pthread_mutex_trylock(mtx); switch(ret) { case 0: return althrd_success; - case EAGAIN: case EBUSY: return althrd_busy; } return althrd_error; |