use SDL_InvalidParamError in the thread 'classes'

This commit is contained in:
pionere
2022-11-19 08:13:12 +01:00
committed by Ryan C. Gordon
parent 61188d4972
commit 450f184f7d
6 changed files with 31 additions and 23 deletions

View File

@@ -58,7 +58,7 @@ int
SDL_CondSignal(SDL_cond *cond) SDL_CondSignal(SDL_cond *cond)
{ {
if (!cond) { if (!cond) {
return SDL_SetError("Passed a NULL condition variable"); return SDL_InvalidParamError("cond");
} }
CondVar_Signal(&cond->cond_variable); CondVar_Signal(&cond->cond_variable);
@@ -70,7 +70,7 @@ int
SDL_CondBroadcast(SDL_cond *cond) SDL_CondBroadcast(SDL_cond *cond)
{ {
if (!cond) { if (!cond) {
return SDL_SetError("Passed a NULL condition variable"); return SDL_InvalidParamError("cond");
} }
CondVar_Broadcast(&cond->cond_variable); CondVar_Broadcast(&cond->cond_variable);
@@ -104,10 +104,10 @@ SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms)
Result res; Result res;
if (!cond) { if (!cond) {
return SDL_SetError("Passed a NULL condition variable"); return SDL_InvalidParamError("cond");
} }
if (!mutex) { if (!mutex) {
return SDL_SetError("Passed a NULL mutex"); return SDL_InvalidParamError("mutex");
} }
res = 0; res = 0;

View File

@@ -56,7 +56,7 @@ int
SDL_LockMutex(SDL_mutex *mutex) SDL_LockMutex(SDL_mutex *mutex)
{ {
if (mutex == NULL) { if (mutex == NULL) {
return SDL_SetError("Passed a NULL mutex"); return SDL_InvalidParamError("mutex");
} }
RecursiveLock_Lock(&mutex->lock); RecursiveLock_Lock(&mutex->lock);
@@ -69,7 +69,7 @@ int
SDL_TryLockMutex(SDL_mutex *mutex) SDL_TryLockMutex(SDL_mutex *mutex)
{ {
if (mutex == NULL) { if (mutex == NULL) {
return SDL_SetError("Passed a NULL mutex"); return SDL_InvalidParamError("mutex");
} }
return RecursiveLock_TryLock(&mutex->lock); return RecursiveLock_TryLock(&mutex->lock);
@@ -80,7 +80,7 @@ int
SDL_mutexV(SDL_mutex *mutex) SDL_mutexV(SDL_mutex *mutex)
{ {
if (mutex == NULL) { if (mutex == NULL) {
return SDL_SetError("Passed a NULL mutex"); return SDL_InvalidParamError("mutex");
} }
RecursiveLock_Unlock(&mutex->lock); RecursiveLock_Unlock(&mutex->lock);

View File

@@ -69,7 +69,7 @@ int
SDL_SemTryWait(SDL_sem *sem) SDL_SemTryWait(SDL_sem *sem)
{ {
if (!sem) { if (!sem) {
return SDL_SetError("Passed a NULL semaphore"); return SDL_InvalidParamError("sem");
} }
return SDL_SemWaitTimeout(sem, 0); return SDL_SemWaitTimeout(sem, 0);
@@ -81,7 +81,7 @@ SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
int retval; int retval;
if (!sem) { if (!sem) {
return SDL_SetError("Passed a NULL semaphore"); return SDL_InvalidParamError("sem");
} }
if (timeout == SDL_MUTEX_MAXWAIT) { if (timeout == SDL_MUTEX_MAXWAIT) {
@@ -114,7 +114,7 @@ Uint32
SDL_SemValue(SDL_sem *sem) SDL_SemValue(SDL_sem *sem)
{ {
if (!sem) { if (!sem) {
return SDL_SetError("Passed a NULL semaphore"); return SDL_InvalidParamError("sem");
} }
return sem->semaphore.current_count; return sem->semaphore.current_count;
} }
@@ -123,7 +123,7 @@ int
SDL_SemPost(SDL_sem *sem) SDL_SemPost(SDL_sem *sem)
{ {
if (!sem) { if (!sem) {
return SDL_SetError("Passed a NULL semaphore"); return SDL_InvalidParamError("sem");
} }
LightSemaphore_Release(&sem->semaphore, 1); LightSemaphore_Release(&sem->semaphore, 1);
return 0; return 0;

View File

@@ -77,8 +77,7 @@ SDL_TryLockMutex(SDL_mutex * mutex)
{ {
if (mutex == NULL) if (mutex == NULL)
{ {
SDL_SetError("Passed a NULL mutex."); return SDL_InvalidParamError("mutex");
return -1;
} }
// Not yet implemented. // Not yet implemented.
@@ -92,7 +91,7 @@ SDL_LockMutex(SDL_mutex * mutex)
{ {
if (mutex == NULL) if (mutex == NULL)
{ {
return SDL_SetError("Passed a NULL mutex."); return SDL_InvalidParamError("mutex");
} }
RMutex rmutex; RMutex rmutex;
@@ -108,7 +107,7 @@ SDL_UnlockMutex(SDL_mutex * mutex)
{ {
if ( mutex == NULL ) if ( mutex == NULL )
{ {
return SDL_SetError("Passed a NULL mutex."); return SDL_InvalidParamError("mutex");
} }
RMutex rmutex; RMutex rmutex;

View File

@@ -119,7 +119,7 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
{ {
if (! sem) if (! sem)
{ {
return SDL_SetError("Passed a NULL sem"); return SDL_InvalidParamError("sem");
} }
if (timeout == SDL_MUTEX_MAXWAIT) if (timeout == SDL_MUTEX_MAXWAIT)
@@ -152,6 +152,11 @@ SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
int int
SDL_SemTryWait(SDL_sem *sem) SDL_SemTryWait(SDL_sem *sem)
{ {
if (! sem)
{
return SDL_InvalidParamError("sem");
}
if(sem->count > 0) if(sem->count > 0)
{ {
sem->count--; sem->count--;
@@ -170,7 +175,7 @@ SDL_SemValue(SDL_sem * sem)
{ {
if (! sem) if (! sem)
{ {
SDL_SetError("Passed a NULL sem."); SDL_InvalidParamError("sem");
return 0; return 0;
} }
return sem->count; return sem->count;
@@ -181,7 +186,7 @@ SDL_SemPost(SDL_sem * sem)
{ {
if (! sem) if (! sem)
{ {
return SDL_SetError("Passed a NULL sem."); return SDL_InvalidParamError("sem");
} }
sem->count++; sem->count++;
RSemaphore sema; RSemaphore sema;

View File

@@ -180,11 +180,15 @@ Uint32
SDL_SemValue(SDL_sem * sem) SDL_SemValue(SDL_sem * sem)
{ {
int ret = 0; int ret = 0;
if (sem) {
sem_getvalue(&sem->sem, &ret); if (!sem) {
if (ret < 0) { SDL_InvalidParamError("sem");
ret = 0; return 0;
} }
sem_getvalue(&sem->sem, &ret);
if (ret < 0) {
ret = 0;
} }
return (Uint32) ret; return (Uint32) ret;
} }