Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify some error checking

Browse Source
This commit is contained in:
Chris Robinson
2014-04-18 06:46:21 -07:00
parent b8d56190d1
commit c041a99f72
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/threads.c
+1 -7
View File
@@ -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;
OpenAL32/Include/threads.h
+4 -14
View File
@@ -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;