Changeset 103415 in vbox for trunk/src

Timestamp:

Feb 19, 2024 7:52:27 AM (12 months ago)

Author:

vboxsync

Message:

Additions,Main,VMM,Runtime: Fix some unused expression warnings, bugref:3409

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (1 diff)
• Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)
• Devices/Audio/AudioTest.cpp (modified) (1 diff)
• Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)
• Main/glue/string.cpp (modified) (2 diffs)
• Main/src-client/GuestDnDSourceImpl.cpp (modified) (2 diffs)
• Main/src-client/GuestDnDTargetImpl.cpp (modified) (1 diff)
• Runtime/common/dbg/dbgmodcodeview.cpp (modified) (4 diffs)
• Runtime/common/log/tracelogreader.cpp (modified) (1 diff)
• Runtime/common/misc/fdt.cpp (modified) (1 diff)
• VMM/VMMR3/EM.cpp (modified) (1 diff)
• VMM/VMMR3/VMMR3VTable.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -1774 +1774 @@
         pStartupInfo->psz##a_Str = (char *)RTMemRealloc(pStartupInfo->psz##a_Str, \
            RT_MIN(pStartupInfo->cb##a_Str * cGrowthFactor, a_cbMax)); \
-        AssertPtrBreakStmt(pStartupInfo->psz##a_Str, VERR_NO_MEMORY); \
+        AssertPtrBreakStmt(pStartupInfo->psz##a_Str, rc = VERR_NO_MEMORY); \
         pStartupInfo->cb##a_Str  = RT_MIN(pStartupInfo->cb##a_Str * cGrowthFactor, a_cbMax);
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1440 +1440 @@
                         if (cbBufSize - cbBufUsed < cbTotal) /* Grow buffer, if needed. */
                         {
-                            AssertBreakStmt(cbTotal <= cbGrowSize, VERR_BUFFER_OVERFLOW);
+                            AssertBreakStmt(cbTotal <= cbGrowSize, rc = VERR_BUFFER_OVERFLOW);
                             pvBuf      = RTMemRealloc(pvBuf, cbBufSize + cbGrowSize);
-                            AssertPtrBreakStmt(pvBuf, VERR_NO_MEMORY);
+                            AssertPtrBreakStmt(pvBuf, rc = VERR_NO_MEMORY);
                             cbBufSize += cbGrowSize;
                         }

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

@@ -2383 +2383 @@
         }
 
-        AssertBreakStmt(cbToCompare >= cbReadA, VERR_INTERNAL_ERROR);
+        AssertBreakStmt(cbToCompare >= cbReadA, rc = VERR_INTERNAL_ERROR);
         cbToCompare -= cbReadA;
         offCur      += cbReadA;

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

@@ -1406 +1406 @@
 
                 uint32_t const cbBeaconRemaining = AudioTestBeaconGetRemaining(pBeacon);
-                AssertBreakStmt(cbBeaconRemaining, VERR_WRONG_ORDER);
+                AssertBreakStmt(cbBeaconRemaining, rc = VERR_WRONG_ORDER);
 
                 /* Limit to exactly one beacon (pre or post). */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -2283 +2283 @@
             pszDstCur = RTStrDup(pszDst);
 
-        AssertPtrBreakStmt(pszDstCur, VERR_NO_MEMORY);
+        AssertPtrBreakStmt(pszDstCur, hrc = E_OUTOFMEMORY);
 
         if (pCtx->cVerbose)

trunk/src/VBox/Main/glue/string.cpp

@@ -606 +606 @@
     size_t cwcSrc;
     int vrc = RTStrCalcUtf16LenEx(pszSrc, cchSrc, &cwcSrc);
-    AssertRCStmt(vrc, E_INVALIDARG);
+    AssertRCReturn(vrc, E_INVALIDARG);
 
     size_t cwcOld = length();
@@ -616 +616 @@
         PRTUTF16 pwszDst = &m_bstr[cwcOld];
         vrc = RTStrToUtf16Ex(pszSrc, cchSrc, &pwszDst, cwcSrc + 1, NULL);
-        AssertRCStmt(vrc, E_INVALIDARG);
+        AssertRCReturn(vrc, E_INVALIDARG);
     }
     m_bstr[cwcTotal] = '\0';

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

@@ -931 +931 @@
 
         const char *pcszSource = DnDTransferObjectGetSourcePath(pObj);
-        AssertPtrBreakStmt(pcszSource, VERR_INVALID_POINTER);
+        AssertPtrBreakStmt(pcszSource, vrc = VERR_INVALID_POINTER);
 
         /** @todo Add sparse file support based on fFlags? (Use Open(..., fFlags | SPARSE). */
@@ -1006 +1006 @@
 
         const char *pcszSource = DnDTransferObjectGetSourcePath(pObj);
-        AssertPtrBreakStmt(pcszSource, VERR_INVALID_POINTER);
+        AssertPtrBreakStmt(pcszSource, vrc = VERR_INVALID_POINTER);
 
         AssertMsgReturn(DnDTransferObjectIsOpen(pObj),

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

@@ -1008 +1008 @@
 
         pvChunk += cbChunk;
-        AssertBreakStmt(cbData >= cbChunk, VERR_BUFFER_UNDERFLOW);
+        AssertBreakStmt(cbData >= cbChunk, vrc = VERR_BUFFER_UNDERFLOW);
         cbData  -= cbChunk;
     }

trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp

@@ -745 +745 @@
                     uint16_t off     = *uCursor.pu16++;
                     uint16_t iSeg    = *uCursor.pu16++;
-                    /*uint16_t iType   =*/ *uCursor.pu16++;
+                    /*uint16_t iType   = * */ uCursor.pu16++;
                     uint8_t  cchName = *uCursor.pu8++;
                     RTDBGMODCV_CHECK_NOMSG_RET_BF(cchName > 0);
@@ -761 +761 @@
                     uint32_t off     = *uCursor.pu32++;
                     uint16_t iSeg    = *uCursor.pu16++;
-                    /*uint16_t iType   =*/ *uCursor.pu16++;
+                    /*uint16_t iType   = * */ uCursor.pu16++;
                     uint8_t  cchName = *uCursor.pu8++;
                     RTDBGMODCV_CHECK_NOMSG_RET_BF(cchName > 0);
@@ -774 +774 @@
                 {
                     RTDBGMODCV_CHECK_NOMSG_RET_BF(cbRec > 2 + 4+4+4+2+2+2+2+2+2+1+1);
-                    /*uint32_t uParent       =*/ *uCursor.pu32++;
-                    /*uint32_t uEnd          =*/ *uCursor.pu32++;
-                    /*uint32_t uNext         =*/ *uCursor.pu32++;
+                    /*uint32_t uParent       = * */ uCursor.pu32++;
+                    /*uint32_t uEnd          = * */ uCursor.pu32++;
+                    /*uint32_t uNext         = * */ uCursor.pu32++;
                     uint16_t cbProc        = *uCursor.pu16++;
-                    /*uint16_t offDebugStart =*/ *uCursor.pu16++;
-                    /*uint16_t offDebugEnd   =*/ *uCursor.pu16++;
+                    /*uint16_t offDebugStart = * */ uCursor.pu16++;
+                    /*uint16_t offDebugEnd   = * */ uCursor.pu16++;
                     uint16_t off           = *uCursor.pu16++;
                     uint16_t iSeg          = *uCursor.pu16++;
-                    /*uint16_t iProcType     =*/ *uCursor.pu16++;
-                    /*uint8_t fbType         =*/ *uCursor.pu8++;
+                    /*uint16_t iProcType     = * */ uCursor.pu16++;
+                    /*uint8_t fbType         = * */ uCursor.pu8++;
                     uint8_t  cchName       = *uCursor.pu8++;
                     RTDBGMODCV_CHECK_NOMSG_RET_BF(cchName > 0);
@@ -796 +796 @@
                 {
                     RTDBGMODCV_CHECK_NOMSG_RET_BF(cbRec > 2 + 4+4+4+4+4+4+4+2+2+1+1);
-                    /*uint32_t uParent       =*/ *uCursor.pu32++;
-                    /*uint32_t uEnd          =*/ *uCursor.pu32++;
-                    /*uint32_t uNext         =*/ *uCursor.pu32++;
-                    /*uint32_t cbProc        =*/ *uCursor.pu32++;
-                    /*uint32_t offDebugStart =*/ *uCursor.pu32++;
-                    /*uint32_t offDebugEnd   =*/ *uCursor.pu32++;
+                    /*uint32_t uParent       = * */ uCursor.pu32++;
+                    /*uint32_t uEnd          = * */ uCursor.pu32++;
+                    /*uint32_t uNext         = * */ uCursor.pu32++;
+                    /*uint32_t cbProc        = * */ uCursor.pu32++;
+                    /*uint32_t offDebugStart = * */ uCursor.pu32++;
+                    /*uint32_t offDebugEnd   = * */ uCursor.pu32++;
                     uint32_t off           = *uCursor.pu32++;
                     uint16_t iSeg          = *uCursor.pu16++;
-                    /*uint16_t iProcType     =*/ *uCursor.pu16++;
-                    /*uint8_t fbType         =*/ *uCursor.pu8++;
+                    /*uint16_t iProcType     = * */ uCursor.pu16++;
+                    /*uint8_t fbType         = * */ uCursor.pu8++;
                     uint8_t  cchName       = *uCursor.pu8++;
                     RTDBGMODCV_CHECK_NOMSG_RET_BF(cchName > 0);

trunk/src/VBox/Runtime/common/log/tracelogreader.cpp

@@ -1181 +1181 @@
             {
                 cbRet = pacbRawData[*pidxRawData];
-                *pidxRawData++;
+                pidxRawData++;
             }
             else

trunk/src/VBox/Runtime/common/misc/fdt.cpp

@@ -572 +572 @@
             return RTErrInfoSetF(pErrInfo, VERR_BUFFER_OVERFLOW, "Structs string too long to fit into target buffer");
 
-        *pszStrSrc++;
+        pszStrSrc++;
         if (!cbLeft)
             return RTErrInfoSetF(pErrInfo, VERR_FDT_DTB_STRUCTS_BLOCK_STRING_NOT_TERMINATED, "Structs block contains an unterminated string");

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -880 +880 @@
                 if (   pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_RAW
                     || pVCpu->em.s.enmState == EMSTATE_DEBUG_HYPER)
-                    AssertLogRelMsgFailedStmt(("Bad EM state."), VERR_EM_INTERNAL_ERROR);
+                    AssertLogRelMsgFailedStmt(("Bad EM state."), rc = VERR_EM_INTERNAL_ERROR);
 #if !defined(VBOX_VMM_TARGET_ARMV8)
                 else if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HM)

trunk/src/VBox/VMM/VMMR3/VMMR3VTable.cpp

@@ -71 +71 @@
 {
     void * volatile pvCaller = ASMReturnAddress();
-    AssertLogRel(("Reserved VMM function table entry called from %p!\n", pvCaller ));
+    AssertLogRelMsgFailed(("Reserved VMM function table entry called from %p!\n", pvCaller ));
     return VERR_INTERNAL_ERROR;
 }