Changeset 104693 in vbox

Timestamp:

May 16, 2024 4:44:11 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163247

Message:

Devices + GuestHost: Fixed warnings. ​​bugref:3409

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioTestServiceTcp.cpp (modified) (1 diff)
• Devices/Audio/DevHdaStream.cpp (modified) (1 diff)
• Devices/Audio/DrvAudio.cpp (modified) (1 diff)
• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (1 diff)
• GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp (modified) (1 diff)

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

@@ -464 +464 @@
     else
     {
-        if (pClient)
-        {
-            atsTcpFreeClient(pThis, pClient);
-            pClient = NULL;
-        }
+        atsTcpFreeClient(pThis, pClient);
+        pClient = NULL;
     }
 

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

@@ -1080 +1080 @@
         Assert(AudioHlpPcmPropsAreValidAndSupported(&pStreamShared->State.Cfg.Props));
 
-        if (fEnable)
-        {
-            if (!AudioHlpFileIsOpen(pStreamR3->Dbg.Runtime.pFileStream))
-            {
-                int rc2 = AudioHlpFileOpen(pStreamR3->Dbg.Runtime.pFileStream, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
-                                           &pStreamShared->State.Cfg.Props);
-                AssertRC(rc2);
-            }
-
-            if (!AudioHlpFileIsOpen(pStreamR3->Dbg.Runtime.pFileDMARaw))
-            {
-                int rc2 = AudioHlpFileOpen(pStreamR3->Dbg.Runtime.pFileDMARaw, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
-                                           &pStreamShared->State.Cfg.Props);
-                AssertRC(rc2);
-            }
-
-            if (!AudioHlpFileIsOpen(pStreamR3->Dbg.Runtime.pFileDMAMapped))
-            {
-                int rc2 = AudioHlpFileOpen(pStreamR3->Dbg.Runtime.pFileDMAMapped, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
-                                           &pStreamShared->State.Cfg.Props);
-                AssertRC(rc2);
-            }
+        if (!AudioHlpFileIsOpen(pStreamR3->Dbg.Runtime.pFileStream))
+        {
+            int rc2 = AudioHlpFileOpen(pStreamR3->Dbg.Runtime.pFileStream, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
+                                       &pStreamShared->State.Cfg.Props);
+            AssertRC(rc2);
+        }
+
+        if (!AudioHlpFileIsOpen(pStreamR3->Dbg.Runtime.pFileDMARaw))
+        {
+            int rc2 = AudioHlpFileOpen(pStreamR3->Dbg.Runtime.pFileDMARaw, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
+                                       &pStreamShared->State.Cfg.Props);
+            AssertRC(rc2);
+        }
+
+        if (!AudioHlpFileIsOpen(pStreamR3->Dbg.Runtime.pFileDMAMapped))
+        {
+            int rc2 = AudioHlpFileOpen(pStreamR3->Dbg.Runtime.pFileDMAMapped, AUDIOHLPFILE_DEFAULT_OPEN_FLAGS,
+                                       &pStreamShared->State.Cfg.Props);
+            AssertRC(rc2);
         }
     }

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

@@ -1623 +1623 @@
         }
     }
-    else if (CfgReq.Backend.cFramesPreBuffering == 0) /* Was the pre-buffering requested as being disabeld? Tell the users. */
+    else /* Was the pre-buffering requested as being disabeld? Tell the users. */
     {
         LogRel2(("Audio: Pre-buffering is disabled for stream '%s'\n", pCfgAcq->szName));

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -1791 +1791 @@
     {
         rc = shClX11RequestDataForX11CallbackHelper(pCtx, VBOX_SHCL_FMT_BITMAP, &pv, &cb);
-        if (   RT_SUCCESS(rc)
-            && (fmtX11 == SHCLX11FMT_BMP))
+        if (RT_SUCCESS(rc))
         {
             /* Create a full BMP from it. */

trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp

@@ -352 +352 @@
 {
     RT_NOREF(display);
+    if (!atom)
+        return NULL;
     const char *pcszName = NULL;
-    if (atom < 0x1000)
-        return NULL;
     if (0x1000 <= atom && atom < 0x2000)
     {