Changeset 107468 in vbox

Timestamp:

Jan 7, 2025 2:44:53 PM (11 days ago)

Author:

vboxsync

Message:

Devices/Graphics/DevVGA.cpp: Fix some redundant condition and unused assignment warnings reported by parfait, bugref:3409

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1064 +1064 @@
                 int h, shift_control;
                 /* Check the values before we screw up with a resolution which is too big or small. */
-                size_t cb = pThis->vbe_regs[VBE_DISPI_INDEX_XRES];
+                size_t cb;
                 if (pThis->vbe_regs[VBE_DISPI_INDEX_BPP] == 4)
                     cb = pThis->vbe_regs[VBE_DISPI_INDEX_XRES] >> 1;
@@ -2344 +2344 @@
             break;
         default:
-        case 0:
+        /*case 0: - Superfluous, checked already in the if above */
             AssertFailed();
             return VERR_NOT_IMPLEMENTED;
@@ -5648 +5648 @@
          */
 # ifdef VBOX_WITH_VMSVGA
-        rc = PDMDevHlpMmio2ControlDirtyPageTracking(pDevIns, pThis->hMmio2VRam,
-                                                    !pThis->svga.fEnabled ||(pThis->svga.fEnabled && pThis->svga.fVRAMTracking));
+        rc = PDMDevHlpMmio2ControlDirtyPageTracking(pDevIns, pThis->hMmio2VRam, !pThis->svga.fEnabled || pThis->svga.fVRAMTracking);
 # else
         rc = PDMDevHlpMmio2ControlDirtyPageTracking(pDevIns, pThis->hMmio2VRam, true /*fEnabled*/);
@@ -5981 +5980 @@
             uint32_t u32;
             rc = pHlp->pfnSSMGetU32(pSSM, &u32);
+            AssertRCReturn(rc, rc);
+
             if (u32)
             {
@@ -6855 +6856 @@
                 rc = VINF_SUCCESS;
             }
-            else
-                rc = VERR_NO_MEMORY;
+            /* else: Out of memory condition is ignored, see below. */
         }
         else