Changeset 44990 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 11, 2013 2:42:39 PM (12 years ago)

Author:

vboxsync

Message:

VBoxGuest-win*: More cleanups.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -285 +285 @@
 {
 #ifdef LOG_ENABLED
-    PCM_PARTIAL_RESOURCE_DESCRIPTOR resource = pResourceList->PartialDescriptors;
-    ULONG nres = pResourceList->Count;
-    ULONG i;
-
-    for (i = 0; i < nres; ++i, ++resource)
-    {
-        ULONG uType = resource->Type;
-        static char* aszName[] =
+    PCM_PARTIAL_RESOURCE_DESCRIPTOR pResource = pResourceList->PartialDescriptors;
+    ULONG cResources = pResourceList->Count;
+
+    for (ULONG i = 0; i < cResources; ++i, ++pResource)
+    {
+        ULONG uType = pResource->Type;
+        static char const * const s_apszName[] =
         {
             "CmResourceTypeNull",
@@ -306 +305 @@
         };
 
-        Log(("VBoxGuest::vbgdNtShowDeviceResources: Type %s",
-               uType < (sizeof(aszName) / sizeof(aszName[0]))
-             ? aszName[uType] : "Unknown"));
+        Log(("VBoxGuest::vbgdNtShowDeviceResources: Type %s", uType < RT_ELEMENTS(s_apszName) ? aszName[uType] : "Unknown"));
 
         switch (uType)
@@ -315 +312 @@
             case CmResourceTypeMemory:
                 Log(("VBoxGuest::vbgdNtShowDeviceResources: Start %8X%8.8lX length %X\n",
-                         resource->u.Port.Start.HighPart, resource->u.Port.Start.LowPart,
-                         resource->u.Port.Length));
+                     pResource->u.Port.Start.HighPart, pResource->u.Port.Start.LowPart,
+                     pResource->u.Port.Length));
                 break;
 
             case CmResourceTypeInterrupt:
                 Log(("VBoxGuest::vbgdNtShowDeviceResources: Level %X, Vector %X, Affinity %X\n",
-                         resource->u.Interrupt.Level, resource->u.Interrupt.Vector,
-                         resource->u.Interrupt.Affinity));
+                     pResource->u.Interrupt.Level, pResource->u.Interrupt.Vector,
+                     pResource->u.Interrupt.Affinity));
                 break;
 
             case CmResourceTypeDma:
                 Log(("VBoxGuest::vbgdNtShowDeviceResources: Channel %d, Port %X\n",
-                         resource->u.Dma.Channel, resource->u.Dma.Port));
+                     pResource->u.Dma.Channel, pResource->u.Dma.Port));
                 break;