Changeset 62363 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main/src-server/linux

Files:

• NetIf-linux.cpp (modified) (2 diffs)
• PerformanceLinux.cpp (modified) (7 diffs)
• USBGetDevices.cpp (modified) (3 diffs)
• USBProxyBackendLinux.cpp (modified) (1 diff)

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;