Changeset 62926 in vbox for trunk

Timestamp:

Aug 3, 2016 3:15:39 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices

Files:

• Network/DrvNetSniffer.cpp (modified) (1 diff)
• Storage/ATAPIPassthrough.cpp (modified) (5 diffs)
• Storage/IOBufMgmt.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

@@ -297 +297 @@
 static DECLCALLBACK(void) drvNetSnifferDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
 

trunk/src/VBox/Devices/Storage/ATAPIPassthrough.cpp

@@ -298 +298 @@
 static int atapiTrackListUpdateFromSendDvdStructure(PTRACKLIST pTrackList, const uint8_t *pbCDB, const void *pvBuf)
 {
+    RT_NOREF(pTrackList, pbCDB, pvBuf);
     return VERR_NOT_IMPLEMENTED;
 }
@@ -313 +314 @@
                                                 bool fMSF, const uint8_t *pbBuf, uint32_t cbBuffer)
 {
+    RT_NOREF(iTrack, cbBuffer); /** @todo unused parameters */
     int rc = VINF_SUCCESS;
     unsigned cbToc = atapiBE2H_U16(pbBuf);
@@ -397 +399 @@
 static int atapiTrackListUpdateFromReadTrackInformation(PTRACKLIST pTrackList, const uint8_t *pbCDB, const void *pvBuf)
 {
+    RT_NOREF(pTrackList, pbCDB, pvBuf);
     return VERR_NOT_IMPLEMENTED;
 }
@@ -402 +405 @@
 static int atapiTrackListUpdateFromReadDvdStructure(PTRACKLIST pTrackList, const uint8_t *pbCDB, const void *pvBuf)
 {
+    RT_NOREF(pTrackList, pbCDB, pvBuf);
     return VERR_NOT_IMPLEMENTED;
 }
@@ -407 +411 @@
 static int atapiTrackListUpdateFromReadDiscInformation(PTRACKLIST pTrackList, const uint8_t *pbCDB, const void *pvBuf)
 {
+    RT_NOREF(pTrackList, pbCDB, pvBuf);
     return VERR_NOT_IMPLEMENTED;
 }

trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp

@@ -97 +97 @@
 }
 
-DECLINLINE(uint32_t) iobufMgrGetObjCount(size_t cbMem, unsigned cBins, size_t cbMin)
-{
-    uint32_t cObjCnt = 0;
-    uint32_t cbBin = cbMin;
+DECLINLINE(uint32_t) iobufMgrGetObjCount(size_t cbMem, unsigned cBins, size_t cbMinBin)
+{
+    size_t cObjs = 0;
+    size_t cbBin = cbMinBin;
 
     while (cBins-- > 0)
     {
-        cObjCnt += cbMem / cbBin;
+        cObjs += cbMem / cbBin;
         cbBin <<= 1; /* The size doubles for every bin. */
     }
 
-    return cObjCnt;
+    Assert((uint32_t)cObjs == cObjs);
+    return (uint32_t)cObjs;
 }
 
@@ -145 +146 @@
             {
                 /* Init the bins. */
-                uint32_t iObj = 0;
+                size_t   iObj  = 0;
                 uint32_t cbBin = IOBUFMGR_BIN_SIZE_MIN;
                 for (unsigned i = 0; i < cBins; i++)
@@ -262 +263 @@
                     iBinCur--;
                     pBinCur = &pThis->paBins[iBinCur];
-                    pBinCur->papvFree[pBinCur->iFree] = pbMem + (RT_BIT(iBinCur + pThis->u32OrderMin));
+                    pBinCur->papvFree[pBinCur->iFree] = pbMem + (size_t)RT_BIT(iBinCur + pThis->u32OrderMin); /* (RT_BIT causes weird MSC warning without cast) */
                     pBinCur->iFree++;
                 }
@@ -280 +281 @@
     /*
      * If we didn't find something in the higher bins try to accumulate as much as possible from the smaller bins.
-     * @todo: Defragment in case there is enough memory free but we can't find something in our bin.
      */
+    /** @todo Defragment in case there is enough memory free but we can't find something in our bin. */
     if (   pBin->iFree == 0
         && iBin > 0)
@@ -294 +295 @@
                 pBin->iFree--;
                 pSeg->pvSeg = pBin->papvFree[pBin->iFree];
-                pSeg->cbSeg = RT_BIT_32(iBin + pThis->u32OrderMin);
+                pSeg->cbSeg = (size_t)RT_BIT_32(iBin + pThis->u32OrderMin);
                 AssertPtr(pSeg->pvSeg);
                 cbAlloc = pSeg->cbSeg;
@@ -306 +307 @@
         pBin->iFree--;
         pSeg->pvSeg = pBin->papvFree[pBin->iFree];
-        pSeg->cbSeg = RT_BIT_32(u32Order);
+        pSeg->cbSeg = (size_t)RT_BIT_32(u32Order);
         cbAlloc = pSeg->cbSeg;
         AssertPtr(pSeg->pvSeg);
@@ -328 +329 @@
     {
         unsigned iSeg = 0;
-        unsigned cbLeft = cbIoBuf;
+        size_t   cbLeft = cbIoBuf;
         PRTSGSEG pSeg = &pIoBufDesc->Int.aSegs[0];
 
@@ -382 +383 @@
             pBin->papvFree[pBin->iFree] = pSeg->pvSeg;
             pBin->iFree++;
-            pThis->cbFree += RT_BIT_32(u32Order);
+            pThis->cbFree += (size_t)RT_BIT_32(u32Order);
         }
         RTCritSectLeave(&pThis->CritSectAlloc);