Changeset 82356 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 3, 2019 9:26:49 PM (5 years ago)

Author:

vboxsync

Message:

DevIchAc97: Removed a bunch of unnecessary AssertPtrReturn statements on input - these should not generally be needed in internal static functions, at least not for checking basic stuff like 'pThis' or 'pStream'. These assertions are prefect for hiding unused parameters and thereby making refactoring the code harder. bugref:9218

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -677 +677 @@
 DECLINLINE(PAUDMIXSINK) ichac97R3IndexToSink(PAC97STATE pThis, uint8_t uIndex)
 {
-    AssertPtrReturn(pThis, NULL);
-
     switch (uIndex)
     {
@@ -811 +809 @@
 static bool ichac97R3StreamIsEnabled(PAC97STATE pThis, PAC97STREAM pStream)
 {
-    AssertPtrReturn(pThis,   false);
-    AssertPtrReturn(pStream, false);
-
     PAUDMIXSINK pSink = ichac97R3IndexToSink(pThis, pStream->u8SD);
     bool fIsEnabled = RT_BOOL(AudioMixerSinkGetStatus(pSink) & AUDMIXSINK_STS_RUNNING);
@@ -832 +827 @@
 static int ichac97R3StreamEnable(PAC97STATE pThis, PAC97STREAM pStream, bool fEnable)
 {
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
-
     ichac97R3StreamLock(pStream);
 
@@ -900 +892 @@
 static void ichac97R3StreamReset(PAC97STATE pThis, PAC97STREAM pStream)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pStream);
-
     ichac97R3StreamLock(pStream);
 
@@ -937 +926 @@
 {
     RT_NOREF(pThis);
-    AssertPtrReturn(pStream, VERR_INVALID_PARAMETER);
-    /** @todo Validate u8Strm. */
 
     LogFunc(("[SD%RU8] pStream=%p\n", u8SD, pStream));
@@ -1090 +1077 @@
 {
     RT_NOREF(pThis);
-    AssertPtrReturn(pDstStream,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pSrcMixSink, VERR_INVALID_POINTER);
-    AssertReturn(cbToWrite,      VERR_INVALID_PARAMETER);
+    AssertReturn(cbToWrite > 0,  VERR_INVALID_PARAMETER);
     /* pcbWritten is optional. */
 
@@ -1136 +1121 @@
 {
     RT_NOREF(pThis);
-    AssertPtrReturn(pSrcStream,  VERR_INVALID_POINTER);
-    AssertPtrReturn(pDstMixSink, VERR_INVALID_POINTER);
-    AssertReturn(cbToRead,       VERR_INVALID_PARAMETER);
+    AssertReturn(cbToRead > 0, VERR_INVALID_PARAMETER);
     /* pcbRead is optional. */
 
@@ -1700 +1683 @@
 static int ichac97R3MixerAddDrvStream(PAC97STATE pThis, PAUDMIXSINK pMixSink, PPDMAUDIOSTREAMCFG pCfg, PAC97DRIVER pDrv)
 {
-    AssertPtrReturn(pThis,    VERR_INVALID_POINTER);
     AssertPtrReturn(pMixSink, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
 
     PPDMAUDIOSTREAMCFG pStreamCfg = DrvAudioHlpStreamCfgDup(pCfg);
@@ -1783 +1764 @@
 static int ichac97R3MixerAddDrvStreams(PAC97STATE pThis, PAUDMIXSINK pMixSink, PPDMAUDIOSTREAMCFG pCfg)
 {
-    AssertPtrReturn(pThis,    VERR_INVALID_POINTER);
     AssertPtrReturn(pMixSink, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
 
     if (!DrvAudioHlpStreamCfgIsValid(pCfg))
@@ -1856 +1835 @@
 static void ichac97R3MixerRemoveDrv(PAC97STATE pThis, PAC97DRIVER pDrv)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pDrv);
-
     if (pDrv->MicIn.pMixStrm)
     {
@@ -1901 +1877 @@
                                           PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc, PAC97DRIVER pDrv)
 {
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pMixSink);
-
     PAC97DRIVERSTREAM pDrvStream = ichac97R3MixerGetDrvStream(pThis, pDrv, enmDir, dstSrc);
     if (pDrvStream)
@@ -1928 +1901 @@
                                            PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc)
 {
-    AssertPtrReturnVoid(pThis);
     AssertPtrReturnVoid(pMixSink);
 
@@ -2153 +2125 @@
 static void ichac97R3StreamLock(PAC97STREAM pStream)
 {
-    AssertPtrReturnVoid(pStream);
     int rc2 = RTCritSectEnter(&pStream->State.CritSect);
     AssertRC(rc2);
@@ -2166 +2137 @@
 static void ichac97R3StreamUnlock(PAC97STREAM pStream)
 {
-    AssertPtrReturnVoid(pStream);
     int rc2 = RTCritSectLeave(&pStream->State.CritSect);
     AssertRC(rc2);
@@ -2179 +2149 @@
 static uint32_t ichac97R3StreamGetUsed(PAC97STREAM pStream)
 {
-    AssertPtrReturn(pStream, 0);
-
     if (!pStream->State.pCircBuf)
         return 0;
@@ -2195 +2163 @@
 static uint32_t ichac97R3StreamGetFree(PAC97STREAM pStream)
 {
-    AssertPtrReturn(pStream, 0);
-
     if (!pStream->State.pCircBuf)
         return 0;
@@ -2493 +2459 @@
 static int ichac97R3MixerReset(PAC97STATE pThis)
 {
-    AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
-
     LogFlowFuncEnter();
 
@@ -2668 +2632 @@
 static int ichac97R3StreamTransfer(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream, uint32_t cbToProcessMax)
 {
-    AssertPtrReturn(pThis,       VERR_INVALID_POINTER);
-    AssertPtrReturn(pStream,     VERR_INVALID_POINTER);
-
     if (!cbToProcessMax)
         return VINF_SUCCESS;