SDL_SemWaitTimeout(...) fix.

[anhanguera]

hi,

on timeout sceKernelWaitSema() returns SCE_KERNEL_ERROR_WAIT_TIMEOUT, not -1. and (int) SCE_KERNEL_ERROR_WAIT_TIMEOUT is < 0. anyway here is the patch.

Code: Select all

--- SDL_syssem.org.c    Wed Oct  5 10:25:52 2005
+++ SDL_syssem.c        Wed Oct  5 10:39:29 2005
@@ -85,7 +85,7 @@
 int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
 {
        Uint32 *pTimeout;
-       int res;
+       unsigned int res;

        if (sem == NULL) {
                SDL_SetError("Passed a NULL sem");
@@ -108,16 +108,15 @@
        }

        res = sceKernelWaitSema(sem->semid, 1, pTimeout);
-       if &#40;res < 0&#41; &#123;
-               SDL_SetError&#40;"WaitForSingleObject&#40;&#41; failed"&#41;;
-               return -1;
-       &#125;
-
-       if &#40;pTimeout != NULL && *pTimeout == SCE_KERNEL_ERROR_WAIT_TIMEOUT&#41; &#123;
-               return SDL_MUTEX_TIMEDOUT;
+       switch &#40;res&#41; &#123;
+               case SCE_KERNEL_ERROR_OK&#58;
+                       return 0;
+               case SCE_KERNEL_ERROR_WAIT_TIMEOUT&#58;
+                       return SDL_MUTEX_TIMEDOUT;
+               default&#58;
+                       SDL_SetError&#40;"WaitForSingleObject&#40;&#41; failed"&#41;;
+                       return -1;
        &#125;
-
-       return 0;
 &#125;

 int SDL_SemTryWait&#40;SDL_sem *sem&#41;

alper "anhanguera" akcan.

[jimparis]

Applied in rev 1119, thanks.