Changeset 62363 in vbox

Timestamp:

Jul 20, 2016 3:45:58 PM (8 years ago)

Author:

vboxsync

Message:

Main/VBoxSVC: enable -Wconversion plus a couple of fixes (all harmless)

Location:

trunk

Files:

• include/VBox/shflsvc.h (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/src-all/DisplayResampleImage.cpp (modified) (3 diffs)
• src/VBox/Main/src-all/DisplayUtils.cpp (modified) (1 diff)
• src/VBox/Main/src-all/ProgressImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/ClientWatcher.cpp (modified) (1 diff)
• src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/NetworkAdapterImpl.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/NetworkServiceRunner.cpp (modified) (1 diff)
• src/VBox/Main/src-server/VFSExplorerImpl.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/generic/NetIf-generic.cpp (modified) (1 diff)
• src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/linux/NetIf-linux.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/linux/PerformanceLinux.cpp (modified) (7 diffs)
• src/VBox/Main/src-server/linux/USBGetDevices.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp (modified) (1 diff)
• src/VBox/Main/src-server/xpcom/server.cpp (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (1 diff)

trunk/include/VBox/shflsvc.h

@@ -181 +181 @@
 DECLINLINE(uint32_t) ShflStringSizeOfBuffer(PCSHFLSTRING pString)
 {
-    return pString ? sizeof(SHFLSTRING) - sizeof(pString->String) + pString->u16Size : 0;
+    return pString ? (uint32_t)(sizeof(SHFLSTRING) - sizeof(pString->String) + pString->u16Size) : 0;
 }
 
@@ -201 +201 @@
     {
         pString = (PSHFLSTRING)pvBuffer;
-        pString->u16Size = u32Size - u32HeaderSize;
+        pString->u16Size = (uint16_t)(u32Size - u32HeaderSize);
         pString->u16Length = 0;
         if (pString->u16Size >= sizeof(pString->String.ucs2[0]))

trunk/src/VBox/Main/Makefile.kmk

@@ -306 +306 @@
 
 ifneq ($(KBUILD_TARGET),win)
- VBoxSVC_CXXFLAGS = -Wunused
+ VBoxSVC_CXXFLAGS = -Wunused -Wconversion
 endif
 

trunk/src/VBox/Main/src-all/DisplayResampleImage.cpp

@@ -50 +50 @@
 
 /* 2.0.10: cast instead of floor() yields 35% performance improvement.
-        Thanks to John Buckman. */
+        Thanks to John Buckman. */
 
 #define floor2(exp) ((long) exp)
@@ -78 +78 @@
 #define gdTrueColorGetBlue(c) ((c) & 0x0000FF)
 #define gdTrueColorAlpha(r, g, b, a) (((a) << 24) + \
-        ((r) << 16) + \
-        ((g) << 8) + \
-        (b))
+        ((r) << 16) + \
+        ((g) << 8) + \
+        (b))
 
 void gdImageCopyResampled (uint8_t *dst,
-                      uint8_t *src,
-                      int dstX, int dstY,
-                      int srcX, int srcY,
-                      int dstW, int dstH, int srcW, int srcH)
+                      uint8_t *src,
+                      int dstX, int dstY,
+                      int srcX, int srcY,
+                      int dstW, int dstH, int srcW, int srcH)
 {
   int x, y;
@@ -94 +94 @@
       sy1 = ((double) y - (double) dstY) * (double) srcH / (double) dstH;
       sy2 = ((double) (y + 1) - (double) dstY) * (double) srcH /
-        (double) dstH;
+        (double) dstH;
       for (x = dstX; (x < dstX + dstW); x++)
-        {
-          double sx, sy;
-          double spixels = 0;
-          double red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0;
-          sx1 = ((double) x - (double) dstX) * (double) srcW / dstW;
-          sx2 = ((double) (x + 1) - (double) dstX) * (double) srcW / dstW;
-          sy = sy1;
-          do
-            {
-              double yportion;
-              if (floor2 (sy) == floor2 (sy1))
-                {
-                  yportion = 1.0 - (sy - floor2 (sy));
-                  if (yportion > sy2 - sy1)
-                    {
-                      yportion = sy2 - sy1;
-                    }
-                  sy = floor2 (sy);
-                }
-              else if (sy == floor2 (sy2))
-                {
-                  yportion = sy2 - floor2 (sy2);
-                }
-              else
-                {
-                  yportion = 1.0;
-                }
-              sx = sx1;
-              do
-                {
-                  double xportion;
-                  double pcontribution;
-                  int p;
-                  if (floor2 (sx) == floor2 (sx1))
-                    {
-                      xportion = 1.0 - (sx - floor2 (sx));
-                      if (xportion > sx2 - sx1)
-                        {
-                          xportion = sx2 - sx1;
-                        }
-                      sx = floor2 (sx);
-                    }
-                  else if (sx == floor2 (sx2))
-                    {
-                      xportion = sx2 - floor2 (sx2);
-                    }
-                  else
-                    {
-                      xportion = 1.0;
-                    }
-                  pcontribution = xportion * yportion;
-                  /* 2.08: previously srcX and srcY were ignored.
-                     Andrew Pattison */
-                  p = gdImageGetTrueColorPixel (src,
-                                                (int) sx + srcX,
-                                                (int) sy + srcY, srcW);
-                  red += gdTrueColorGetRed (p) * pcontribution;
-                  green += gdTrueColorGetGreen (p) * pcontribution;
-                  blue += gdTrueColorGetBlue (p) * pcontribution;
-                  alpha += gdTrueColorGetAlpha (p) * pcontribution;
-                  spixels += xportion * yportion;
-                  sx += 1.0;
-                }
-              while (sx < sx2);
-              sy += 1.0;
-            }
-          while (sy < sy2);
-          if (spixels != 0.0)
-            {
-              red /= spixels;
-              green /= spixels;
-              blue /= spixels;
-              alpha /= spixels;
-            }
-          /* Clamping to allow for rounding errors above */
-          if (red > 255.0)
-            {
-              red = 255.0;
-            }
-          if (green > 255.0)
-            {
-              green = 255.0;
-            }
-          if (blue > 255.0)
-            {
-              blue = 255.0;
-            }
-          if (alpha > gdAlphaMax)
-            {
-              alpha = gdAlphaMax;
-            }
-          gdImageSetPixel (dst,
-                           x, y,
-                           gdTrueColorAlpha ((int) red,
-                                             (int) green,
-                                             (int) blue, (int) alpha), dstW);
-        }
+        {
+          double sx, sy;
+          double spixels = 0;
+          double red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0;
+          sx1 = ((double) x - (double) dstX) * (double) srcW / dstW;
+          sx2 = ((double) (x + 1) - (double) dstX) * (double) srcW / dstW;
+          sy = sy1;
+          do
+            {
+              double yportion;
+              if (floor2 (sy) == floor2 (sy1))
+                {
+                  yportion = 1.0 - (sy - (double)floor2 (sy));
+                  if (yportion > sy2 - sy1)
+                    {
+                      yportion = sy2 - sy1;
+                    }
+                  sy = (double)floor2 (sy);
+                }
+              else if (sy == floor2 (sy2))
+                {
+                  yportion = sy2 - (double)floor2 (sy2);
+                }
+              else
+                {
+                  yportion = 1.0;
+                }
+              sx = sx1;
+              do
+                {
+                  double xportion;
+                  double pcontribution;
+                  int p;
+                  if (floor2 (sx) == floor2 (sx1))
+                    {
+                      xportion = 1.0 - (sx - (double)floor2 (sx));
+                      if (xportion > sx2 - sx1)
+                        {
+                          xportion = sx2 - sx1;
+                        }
+                      sx = (double)floor2 (sx);
+                    }
+                  else if (sx == floor2 (sx2))
+                    {
+                      xportion = sx2 - (double)floor2 (sx2);
+                    }
+                  else
+                    {
+                      xportion = 1.0;
+                    }
+                  pcontribution = xportion * yportion;
+                  /* 2.08: previously srcX and srcY were ignored.
+                     Andrew Pattison */
+                  p = gdImageGetTrueColorPixel (src,
+                                                (int) sx + srcX,
+                                                (int) sy + srcY, srcW);
+                  red += gdTrueColorGetRed (p) * pcontribution;
+                  green += gdTrueColorGetGreen (p) * pcontribution;
+                  blue += gdTrueColorGetBlue (p) * pcontribution;
+                  alpha += gdTrueColorGetAlpha (p) * pcontribution;
+                  spixels += xportion * yportion;
+                  sx += 1.0;
+                }
+              while (sx < sx2);
+              sy += 1.0;
+            }
+          while (sy < sy2);
+          if (spixels != 0.0)
+            {
+              red /= spixels;
+              green /= spixels;
+              blue /= spixels;
+              alpha /= spixels;
+            }
+          /* Clamping to allow for rounding errors above */
+          if (red > 255.0)
+            {
+              red = 255.0;
+            }
+          if (green > 255.0)
+            {
+              green = 255.0;
+            }
+          if (blue > 255.0)
+            {
+              blue = 255.0;
+            }
+          if (alpha > gdAlphaMax)
+            {
+              alpha = gdAlphaMax;
+            }
+          gdImageSetPixel (dst,
+                           x, y,
+                           gdTrueColorAlpha ((int) red,
+                                             (int) green,
+                                             (int) blue, (int) alpha), dstW);
+        }
     }
 }

trunk/src/VBox/Main/src-all/DisplayUtils.cpp

@@ -70 +70 @@
                         if (cbBlock > 2 * sizeof(uint32_t))
                         {
-                            cbData = cbBlock - 2 * sizeof(uint32_t);
+                            cbData = (uint32_t)(cbBlock - 2 * sizeof(uint32_t));
                             pu8Data = (uint8_t *)RTMemAlloc(cbData);
                             if (pu8Data == NULL)

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -625 +625 @@
             uint64_t ullTimeNow = RTTimeMilliTS();
             uint64_t ullTimeElapsed = ullTimeNow - m_ullTimestamp;
-            uint64_t ullTimeTotal = (uint64_t)(ullTimeElapsed * 100 / dPercentDone);
+            uint64_t ullTimeTotal = (uint64_t)((double)ullTimeElapsed * 100 / dPercentDone);
             uint64_t ullTimeRemaining = ullTimeTotal - ullTimeElapsed;
 

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

@@ -1299 +1299 @@
      */
     char    *pszOvfNameBase = NULL;
-    size_t   cchOvfNameBase = 0;
+    size_t   cchOvfNameBase = 0; NOREF(cchOvfNameBase);
     unsigned cLeftToFind = 3;
     HRESULT  hrc = S_OK;
@@ -1447 +1447 @@
     int vrc = RTVfsIoStrmReadAll(hVfsIosOvf, &pvBufferedOvf, &cbBufferedOvf);
     uint32_t cRefs = RTVfsIoStrmRelease(hVfsIosOvf);     /* consumes stream handle.  */
+    NOREF(cRefs);
     Assert(cRefs == 0);
     if (RT_FAILURE(vrc))

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

@@ -966 +966 @@
                 {
                     uOld = ASMAtomicUoReadU8(&that->mUpdateAdaptCtr);
-                    uNew = uOld ? uOld - 1 : uOld;
+                    uNew = uOld ? (uint8_t)(uOld - 1) : uOld;
                 } while (!ASMAtomicCmpXchgU8(&that->mUpdateAdaptCtr, uNew, uOld));
                 Assert(uOld <= RT_ELEMENTS(s_aUpdateTimeoutSteps) - 1);

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

@@ -216 +216 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aVersion = mUsb->bcdUSB >> 8;
+    *aVersion = (USHORT)(mUsb->bcdUSB >> 8);
 
     return S_OK;
@@ -257 +257 @@
      */
     if (mUsb->enmSpeed == USBDEVICESPEED_UNKNOWN)
-        *aPortVersion = mUsb->bcdUSB >> 8;
+        *aPortVersion = (USHORT)(mUsb->bcdUSB >> 8);
     else
     {
@@ -459 +459 @@
         alock.release();
         HRESULT hrc = i_attachToVM(aMachine, aCaptureFilename, aMaskedIfs);
-        return SUCCEEDED(hrc);
+        return hrc;
     }
 

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

@@ -8854 +8854 @@
     const ComObjPtr<Medium> &pTarget = task.mMedium;
 
-    uint64_t size = 0, logicalSize = 0;
-    MediumVariant_T variant = MediumVariant_Standard;
+    uint64_t size = 0; NOREF(size);
+    uint64_t logicalSize = 0; NOREF(logicalSize);
+    MediumVariant_T variant = MediumVariant_Standard; NOREF(variant);
 
     /*

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

@@ -26 +26 @@
 #include "VirtualBoxImpl.h"
 
+#include <iprt/ctype.h>
 #include <iprt/string.h>
 #include <iprt/cpp/utils.h>
@@ -353 +354 @@
                     if (c >= 'a' && c <= 'f')
                     {
-                        /** @todo the runtime lacks an ascii lower/upper conv */
-                        c &= 0xdf;
+                        c = (char)RTLocCToUpper(c);
                         *macAddressStr = c;
                     }
                     /* we only accept capital letters */
-                    if (((c < '0') || (c > '9')) &&
-                        ((c < 'A') || (c > 'F')))
+                    if (   (c < '0' || c > '9')
+                        && (c < 'A' || c > 'F'))
                         rc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
                     /* the second digit must have even value for unicast addresses */
-                    if ((i == 1) && (!!(c & 1) == (c >= '0' && c <= '9')))
+                    if (   (i == 1)
+                        && (!!(c & 1) == (c >= '0' && c <= '9')))
                         rc = setError(E_INVALIDARG, tr("Invalid MAC address format"));
 

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

@@ -153 +153 @@
         RTProcTerminate(m->mProcess);
         int rc = RTProcWait(m->mProcess, RTPROCWAIT_FLAGS_BLOCK, NULL);
+        NOREF(rc);
     }
 

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

@@ -173 +173 @@
     {
         int vrc = taskThread(NULL, this);
+        NOREF(vrc);
     }
 
@@ -352 +353 @@
     HRESULT rc = S_OK;
 
-    float fPercentStep = 100.0f / aTask->filenames.size();
+    float fPercentStep = 100.0f / (float)aTask->filenames.size();
     try
     {
@@ -369 +370 @@
                 throw setError(VBOX_E_FILE_ERROR, tr("Can't delete file '%s' (%Rrc)"), szPath, vrc);
             if (aTask->progress)
-                aTask->progress->SetCurrentOperationProgress((ULONG)(fPercentStep * i));
+                aTask->progress->SetCurrentOperationProgress((ULONG)(fPercentStep * (float)i));
         }
     }

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -113 +113 @@
     if (fp)
     {
-        if (fgets(pszBuffer, cBufSize, fp))
+        if (fgets(pszBuffer, (int)cBufSize, fp))
         {
             if (!strncmp(VBOXNETADPCTL_NAME ":", pszBuffer, sizeof(VBOXNETADPCTL_NAME)))

trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

@@ -532 +532 @@
                 rc = VERR_INVALID_STATE;
             }
-            aMillies -= (RTTimeMilliTS() - msPollStart);
+            aMillies -= (RTMSINTERVAL)(RTTimeMilliTS() - msPollStart);
         }
         else if (rc == VERR_TIMEOUT)
@@ -667 +667 @@
     {
         int rc = RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_SOCKET);
+        NOREF(rc);
         Assert(RT_SUCCESS(rc) || rc == VERR_POLL_HANDLE_ID_NOT_FOUND);
 

trunk/src/VBox/Main/src-server/linux/NetIf-linux.cpp

@@ -145 +145 @@
         RTUuidClear(&uuid);
         memcpy(&uuid, Req.ifr_name, RT_MIN(sizeof(Req.ifr_name), sizeof(uuid)));
-        uuid.Gen.u8ClockSeqHiAndReserved = (uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80;
-        uuid.Gen.u16TimeHiAndVersion = (uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000;
+        uuid.Gen.u8ClockSeqHiAndReserved = (uint8_t)((uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80);
+        uuid.Gen.u16TimeHiAndVersion = (uint16_t)((uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000);
         memcpy(uuid.Gen.au8Node, &Req.ifr_hwaddr.sa_data, sizeof(uuid.Gen.au8Node));
         pInfo->Uuid = uuid;
@@ -233 +233 @@
                     continue;
                 *pszEndOfName = 0;
-                int iFirstNonWS = strspn(buf, " ");
-                char *pszName = buf+iFirstNonWS;
+                size_t iFirstNonWS = strspn(buf, " ");
+                char *pszName = buf + iFirstNonWS;
                 NETIFINFO Info;
                 RT_ZERO(Info);

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -82 +82 @@
     uint64_t     mSingleUser, mSingleKernel, mSingleIdle;
     uint32_t     mHZ;
-    ULONG        totalRAM;
+    ULONG        mTotalRAM;
 };
 
@@ -101 +101 @@
     }
     else
-        mHZ = hz;
+        mHZ = (uint32_t)hz;
     LogFlowThisFunc(("mHZ=%u\n", mHZ));
 
@@ -107 +107 @@
     int rc = RTSystemQueryTotalRam(&cb);
     if (RT_FAILURE(rc))
-        totalRAM = 0;
+        mTotalRAM = 0;
     else
-        totalRAM = (ULONG)(cb / 1024);
+        mTotalRAM = (ULONG)(cb / 1024);
 }
 
@@ -212 +212 @@
 int CollectorLinux::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
-    AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
+    AssertReturn(mTotalRAM, VERR_INTERNAL_ERROR);
     uint64_t cb;
     int rc = RTSystemQueryAvailableRam(&cb);
     if (RT_SUCCESS(rc))
     {
-        *total = totalRAM;
-        *available = cb / 1024;
+        *total = mTotalRAM;
+        *available = (ULONG)(cb / 1024);
         *used = *total - *available;
     }
@@ -413 +413 @@
 char *CollectorLinux::trimNewline(char *pszName)
 {
-    unsigned cbName = strlen(pszName);
+    size_t cbName = strlen(pszName);
     if (cbName == 0)
         return pszName;
@@ -427 +427 @@
 char *CollectorLinux::trimTrailingDigits(char *pszName)
 {
-    unsigned cbName = strlen(pszName);
+    size_t cbName = strlen(pszName);
     if (cbName == 0)
         return pszName;
@@ -452 +452 @@
 {
     unsigned cbName = 0;
-    unsigned cbDevName = strlen(pszDevName);
+    size_t cbDevName = strlen(pszDevName);
     const char *pszEnd = pszDevName + cbDevName - 1;
     if (fTrimDigits)

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -376 +376 @@
          * Set the value.
          */
-        *pu16 = (uint16_t)u32Int << 8 | (uint16_t)u32Dec;
+        *pu16 = (uint16_t)((u32Int << 8) | (uint16_t)u32Dec);
     }
     return VINF_SUCCESS;
@@ -1179 +1179 @@
 
     /* usbfs compatibility, 0-based port number. */
-    *pu8Port -= 1;
+    *pu8Port = (uint8_t)(*pu8Port - 1);
     return VINF_SUCCESS;
 }
@@ -1284 +1284 @@
     /* Fill in the simple fields */
     pDev->enmState           = USBDEVICESTATE_UNUSED;
-    pDev->bBus               = usbsysfsGetBusFromPath(pszSysfsPath);
+    pDev->bBus               = (uint8_t)usbsysfsGetBusFromPath(pszSysfsPath);
     pDev->bDeviceClass       = usbsysfsReadDevicePropertyU8Def(16, 0, "%s/bDeviceClass", pszSysfsPath);
     pDev->bDeviceSubClass    = usbsysfsReadDevicePropertyU8Def(16, 0, "%s/bDeviceSubClass", pszSysfsPath);

trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp

@@ -321 +321 @@
 
     RT_ZERO(PollFds);
-    PollFds[0].fd        = RTFileToNative(mhFile);
+    PollFds[0].fd        = (int)RTFileToNative(mhFile);
     PollFds[0].events    = POLLIN;
-    PollFds[1].fd        = RTPipeToNative(mhWakeupPipeR);
+    PollFds[1].fd        = (int)RTPipeToNative(mhWakeupPipeR);
     PollFds[1].events    = POLLIN | POLLERR | POLLHUP;
 

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

@@ -838 +838 @@
         {
             char szBuf[80];
-            int  iSize;
-
-            iSize = RTStrPrintf(szBuf, sizeof(szBuf),
+            size_t cSize;
+
+            cSize = RTStrPrintf(szBuf, sizeof(szBuf),
                                 VBOX_PRODUCT" XPCOM Server Version "
                                 VBOX_VERSION_STRING);
-            for (int i = iSize; i > 0; i--)
+            for (size_t i = cSize; i > 0; i--)
                 putchar('*');
             RTPrintf("\n%s\n", szBuf);

trunk/src/VBox/Main/xml/Settings.cpp

@@ -907 +907 @@
         (*pf)->getAttributeValue("hostip", rule.strHostIP);
         (*pf)->getAttributeValue("hostport", port);
-        rule.u16HostPort = port;
+        rule.u16HostPort = (uint16_t)port;
         (*pf)->getAttributeValue("guestip", rule.strGuestIP);
         (*pf)->getAttributeValue("guestport", port);
-        rule.u16GuestPort = port;
+        rule.u16GuestPort = (uint16_t)port;
         mapRules.insert(std::make_pair(rule.strName, rule));
     }