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

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

108908

Message:

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

File:

• trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp (modified) (7 diffs)

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)