Changeset 63176 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 8, 2016 2:54:57 PM (8 years ago)

Author:

vboxsync

Message:

Main: warnings

Location:

trunk/src/VBox/Main

Files:

• include/PerformanceImpl.h (modified) (1 diff)
• src-server/AudioAdapterImpl.cpp (modified) (1 diff)
• src-server/PerformanceImpl.cpp (modified) (2 diffs)
• src-server/win/NetIf-win.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/PerformanceImpl.h

@@ -171 +171 @@
     typedef std::list<pm::BaseMetric*> BaseMetricList;
 
-    enum
-    {
-        MAGIC = 0xABBA1972u
-    };
-
-    unsigned int mMagic;
+/** PerformanceMetric::mMagic value. */
+#define PERFORMANCE_METRIC_MAGIC    UINT32_C(0xABBA1972)
+    uint32_t mMagic;
     const Utf8Str mUnknownGuest;
 

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

@@ -316 +316 @@
 
             default:
-                AssertMsgFailed(("Wrong audio controller type %d\n",
-                                 aAudioController));
+                AssertMsgFailed(("Wrong audio controller type %d\n", aAudioController));
+                defaultCodec = AudioCodecType_Null; /* Shut up MSC */
                 rc = E_FAIL;
         }

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

@@ -187 +187 @@
 
     /* Let the sampler know it gets a valid collector.  */
-    mMagic = MAGIC;
+    mMagic = PERFORMANCE_METRIC_MAGIC;
 
     /* Start resource usage sampler */
@@ -640 +640 @@
     AssertReturnVoid(pvUser != NULL);
     PerformanceCollector *collector = static_cast <PerformanceCollector *> (pvUser);
-    Assert(collector->mMagic == MAGIC);
-    if (collector->mMagic == MAGIC)
+    Assert(collector->mMagic == PERFORMANCE_METRIC_MAGIC);
+    if (collector->mMagic == PERFORMANCE_METRIC_MAGIC)
         collector->samplerCallback(iTick);
 

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

@@ -196 +196 @@
                     pInfo->enmMediumType = NETIF_T_ETHERNET;
                     pInfo->enmStatus = pAdapter->OperStatus == IfOperStatusUp ? NETIF_S_UP : NETIF_S_DOWN;
-                    pInfo->bIsDefault = (pAdapter->IfIndex == iDefault);
+                    pInfo->bIsDefault = (pAdapter->IfIndex == (DWORD)iDefault);
                     RTStrFree(pszUuid);
                     break;
@@ -981 +981 @@
         if (hr == S_OK)
         {
+            Guid guidIfCopy(IfGuid);
             NETIFINFO Info;
             RT_ZERO(Info);
-            Info.Uuid = *(Guid(IfGuid).raw());
-            rc = collectNetIfInfo(name, Guid(IfGuid), &Info, iDefaultInterface);
+            Info.Uuid = *guidIfCopy.raw();
+            rc = collectNetIfInfo(name, guidIfCopy, &Info, iDefaultInterface);
             if (RT_FAILURE(rc))
-            {
                 LogRel(("vboxNetWinAddComponent: collectNetIfInfo() -> %Rrc\n", rc));
-            }
             Log(("vboxNetWinAddComponent: adding %ls\n", lpszName));
             /* create a new object and add it to the list */
@@ -1865 +1864 @@
                 {
                     info.enmStatus = pAdapter->OperStatus == IfOperStatusUp ? NETIF_S_UP : NETIF_S_DOWN;
-                    info.bIsDefault = (pAdapter->IfIndex == iDefault);
+                    info.bIsDefault = (pAdapter->IfIndex == (DWORD)iDefault);
                     info.bDhcpEnabled = pAdapter->Flags & IP_ADAPTER_DHCP_ENABLED;
                     netIfFillInfoWithAddresses(&info, pAdapter);