Changeset 104635 in vbox

Timestamp:

May 15, 2024 9:29:32 AM (7 months ago)

Author:

vboxsync

Message:

Main: Fixed warnings. ​bugref:3409

Location:

trunk/src/VBox/Main

Files:

• src-client/DrvAudioRec.cpp (modified) (1 diff)
• src-client/GuestDirectoryImpl.cpp (modified) (1 diff)
• src-client/GuestDnDPrivate.cpp (modified) (2 diffs)
• src-client/GuestDnDTargetImpl.cpp (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (4 diffs)
• src-client/RecordingCodec.cpp (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (1 diff)
• src-server/PlatformX86Impl.cpp (modified) (1 diff)
• src-server/RecordingScreenSettingsImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

@@ -777 +777 @@
                         LogRel(("Recording: Error creating audio file '%s' (%Rrc)\n", pszFile, vrc));
                 }
+                break;
+        #else
+                vrc = VERR_NOT_SUPPORTED;
                 break;
         #endif

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

@@ -947 +947 @@
                 }
             }
-            else if (pEvent->HasGuestError() && pvrcGuest)
+            else if (pEvent->HasGuestError())
                 *pvrcGuest = pEvent->GuestResult();
         }

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -534 +534 @@
 
             if (!fCompleted)
+            {
                 hrc = m_pProgress->i_notifyComplete(VBOX_E_DND_ERROR, COM_IIDOF(IGuest),
                                                     m_pParent->getComponentName(), strMsg.c_str());
+                AssertComRC(hrc);
+            }
             break;
         }
@@ -1553 +1556 @@
                  pData->cbExtra, pData->cbProcessed, pData->getRemaining(), cbDataAdd));
 
-    if (   !pState
-        || !cbDataAdd) /* Only update if something really changes. */
+    if (!cbDataAdd) /* Only update if something really changes. */
         return VINF_SUCCESS;
 
-    if (cbDataAdd)
-        pData->addProcessed(cbDataAdd);
+    pData->addProcessed(cbDataAdd);
 
     const uint8_t uPercent = pData->getPercentComplete();

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -1210 +1210 @@
     /* Protocol version 1 sends the file path *every* time with a new file chunk.
      * In protocol version 2 we only do this once with HOST_DND_FN_HG_SND_FILE_HDR. */
-    if (m_pState->m_uProtocolVersion <= 1)
+    AssertReturn(m_pState->m_uProtocolVersion, VERR_WRONG_ORDER);
+    if (m_pState->m_uProtocolVersion == 1)
     {
         const size_t cchDstPath = RTStrNLen(pcszDstPath, RTPATH_MAX);

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -1084 +1084 @@
                 // Nothing to do here.
             }
-            else if (pEvent->HasGuestError() && pvrcGuest)
+            else if (pEvent->HasGuestError())
                 *pvrcGuest = pEvent->GuestResult();
         }
@@ -1250 +1250 @@
     {
         vrc = pEvent->Wait(GSTCTL_DEFAULT_TIMEOUT_MS);
-        if (pEvent->HasGuestError() && pvrcGuest)
+        if (pEvent->HasGuestError())
             *pvrcGuest = pEvent->GuestResult();
     }
@@ -1422 +1422 @@
                 else
                 {
-                    if (pvrcGuest)
-                        *pvrcGuest = vrcGuest;
+                    *pvrcGuest = vrcGuest;
                     vrc = VERR_GSTCTL_GUEST_ERROR;
                 }
@@ -1531 +1530 @@
     {
         /* Nothing further to do here yet. */
-        if (pvrcGuest)
-            *pvrcGuest = VINF_SUCCESS;
+        *pvrcGuest = VINF_SUCCESS;
     }
 

trunk/src/VBox/Main/src-client/RecordingCodec.cpp

@@ -195 +195 @@
                                      /* Source */
                                      pVideoFrame->pu8RGBBuf, pCodec->Parms.Video.uWidth, pCodec->Parms.Video.uHeight);
+    AssertRCReturn(vrc, vrc);
 
     PRECORDINGCODECVPX pVPX = &pCodec->Video.VPX;

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -204 +204 @@
     Data()
         :
+          pParent(NULL),
           fDVDDrivesListBuilt(false),
           fFloppyDrivesListBuilt(false),

trunk/src/VBox/Main/src-server/PlatformX86Impl.cpp

@@ -403 +403 @@
             m->bd.backup();
             m->bd->fX2APIC = !!aValue;
-            if (aValue)
-                m->bd->fAPIC = !!aValue;
+            m->bd->fAPIC   = !!aValue;
             break;
         }

trunk/src/VBox/Main/src-server/RecordingScreenSettingsImpl.cpp

@@ -53 +53 @@
     Data()
         : pParent(NULL)
+        , uScreenId(0)
         , cRefs(0)
     { }