Changeset 43541 in vbox for trunk/src/VBox/Main/src-server/solaris

Timestamp:

Oct 4, 2012 1:04:59 PM (12 years ago)

Author:

vboxsync

Message:

Main/Metrics: Speed may not fit into uint32_t fixed (#6345)

File:

• trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp (modified) (3 diffs)

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

@@ -51 +51 @@
 #include "DynLoadLibSolaris.h"
 
-static uint64 kstatGet(const char *pszMask)
+static uint64_t kstatGet(const char *pszMask)
 {
     char szBuf[RTPATH_MAX];
@@ -107 +107 @@
     char szMask[RTPATH_MAX];
     RTStrPrintf(szMask, sizeof(szMask), "*:*:%s:ifspeed", pInfo->szShortName);
-    pInfo->uSpeedMbits = kstatGet(szMask);
-    if (pInfo->uSpeedMbits == 0)
+    uint64_t uSpeed = kstatGet(szMask);
+    if (uSpeed == 0)
     {
         Log(("queryIfaceSpeed: failed to get speed for %s via kstat(%s)\n", pInfo->szShortName, szMask));
@@ -116 +116 @@
         RTStrPrintf(szMask, sizeof(szMask), "%s:%u:*:ifspeed",
                     szDevName, uInstance);
-        pInfo->uSpeedMbits = kstatGet(szMask);
-        if (pInfo->uSpeedMbits == 0)
+        uSpeed = kstatGet(szMask);
+        if (uSpeed == 0)
             LogRel(("queryIfaceSpeed: failed to get speed for %s(instance=%u) via kstat\n", szDevName, uInstance));
     }
-    pInfo->uSpeedMbits /= 1000000; /* bits -> Mbits */
+    pInfo->uSpeedMbits = uSpeed / 1000000; /* bits -> Mbits */
 }