wasapi: removed excessive argument checks in stream management functions

diff --git a/src/hostapi/wasapi/pa_win_wasapi.c b/src/hostapi/wasapi/pa_win_wasapi.c
index 31e1675be52ff017c1f34db12252c1a59cc91d6e..7154aa3c820d4563739d150dd42dcfc4ff25ed6b 100644 (file)
--- a/src/hostapi/wasapi/pa_win_wasapi.c
+++ b/src/hostapi/wasapi/pa_win_wasapi.c
@@ -2263,10 +2263,6 @@ static PaError CloseStream( PaStream* s )
     PaError result = paNoError;\r
     PaWasapiStream *stream = (PaWasapiStream*)s;\r
 \r
-       // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
        // abort active stream\r
        if (IsStreamActive(s))\r
        {\r
@@ -2300,10 +2296,6 @@ static PaError StartStream( PaStream *s )
        HRESULT hr;\r
     PaWasapiStream *stream = (PaWasapiStream*)s;\r
 \r
-       // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
        // check if stream is active already\r
        if (IsStreamActive(s))\r
                return paStreamIsNotStopped;\r
@@ -2418,45 +2410,29 @@ static void _FinishStream(PaWasapiStream *stream)
 // ------------------------------------------------------------------------------------------\r
 static PaError StopStream( PaStream *s )\r
 {\r
-    PaError result = paNoError;\r
-\r
-       // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
        // Finish stream\r
        _FinishStream((PaWasapiStream *)s);\r
-\r
-    return result;\r
+    return paNoError;\r
 }\r
 \r
 // ------------------------------------------------------------------------------------------\r
 static PaError AbortStream( PaStream *s )\r
 {\r
-    PaError result = paNoError;\r
-\r
-       // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
        // Finish stream\r
        _FinishStream((PaWasapiStream *)s);\r
-\r
-    return result;\r
+    return paNoError;\r
 }\r
 \r
 // ------------------------------------------------------------------------------------------\r
 static PaError IsStreamStopped( PaStream *s )\r
 {\r
-    PaWasapiStream *stream = (PaWasapiStream*)s;\r
-       return (stream ? !stream->running : paBadStreamPtr);\r
+       return !((PaWasapiStream *)s)->running;\r
 }\r
 \r
 // ------------------------------------------------------------------------------------------\r
 static PaError IsStreamActive( PaStream *s )\r
 {\r
-    PaWasapiStream *stream = (PaWasapiStream*)s;\r
-    return (stream ? stream->running : paBadStreamPtr);\r
+    return ((PaWasapiStream *)s)->running;\r
 }\r
 \r
 // ------------------------------------------------------------------------------------------\r
@@ -2464,10 +2440,6 @@ static PaTime GetStreamTime( PaStream *s )
 {\r
     PaWasapiStream *stream = (PaWasapiStream*)s;\r
 \r
-       // validate\r
-       if (s == NULL)\r
-               return paBadStreamPtr;\r
-\r
     /* suppress unused variable warnings */\r
     (void) stream;\r
 \r
@@ -2482,8 +2454,7 @@ static PaTime GetStreamTime( PaStream *s )
 // ------------------------------------------------------------------------------------------\r
 static double GetStreamCpuLoad( PaStream* s )\r
 {\r
-    PaWasapiStream *stream = (PaWasapiStream *)s;\r
-       return (stream ? PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer ) : 0.0);\r
+       return PaUtil_GetCpuLoad(&((PaWasapiStream *)s)->cpuLoadMeasurer);\r
 }\r
 \r
 // ------------------------------------------------------------------------------------------\r