Changeset 43753 in vbox

Timestamp:

Oct 26, 2012 9:36:31 AM (12 years ago)

Author:

vboxsync

Message:

src-client/ConsoleImpl2.cpp: Build fix r81663.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -466 +466 @@
 /** Helper that finds out the next SATA port used
  */
-static int GetNextUsedSataPort(int aSataPortUsed[30], int iBaseVal, int iSize)
+static LONG GetNextUsedSataPort(LONG aSataPortUsed[30], LONG lBaseVal, uint32_t u32Size)
 {
-    int iNextPortUsed = 30;
-    for (size_t j = 0; j < iSize; ++j)
+    LONG lNextPortUsed = 30;
+    for (size_t j = 0; j < u32Size; ++j)
     {
-        if(aSataPortUsed[j] > iBaseVal &&
-           aSataPortUsed[j] <= iNextPortUsed)
-           iNextPortUsed = aSataPortUsed[j];
+        if(aSataPortUsed[j] > lBaseVal &&
+           aSataPortUsed[j] <= lNextPortUsed)
+           lNextPortUsed = aSataPortUsed[j];
     }
-    return iNextPortUsed;
+    return lNextPortUsed;
 }
 
@@ -1632 +1632 @@
                         { "SataLUN1", "SataLUN2", "SataLUN3", "SataLUN4" };
 
-                        int iPortNum = 0;
-                        uint32_t u32PortLUN[MAX_SATA_LUN_COUNT];
-                        uint32_t u32PortUsed[MAX_SATA_PORTS];
+                        LONG lPortNum = 0;
+                        LONG lPortLUN[MAX_SATA_LUN_COUNT];
+                        LONG lPortUsed[MAX_SATA_PORTS];
                         uint32_t u32HDSataPortCount = 0;
                         uint32_t u32MaxPortCount = MAX_SATA_LUN_COUNT;
-                        uint32_t u32NumAttachments = 0;
+                        size_t uNumAttachments = 0;
                         DeviceType_T lType;
                         com::SafeIfaceArray<IMediumAttachment> atts;
 
                         /* init to max value */
-                        u32PortLUN[0] = MAX_SATA_PORTS;
+                        lPortLUN[0] = MAX_SATA_PORTS;
 
                         if (pBiosCfg)
@@ -1652 +1652 @@
                         hrc = pMachine->GetMediumAttachmentsOfController(controllerName.raw(),
                                                             ComSafeArrayAsOutParam(atts));  H();
-                        u32NumAttachments = atts.size();
-                        if (u32NumAttachments > MAX_SATA_PORTS)
+                        uNumAttachments = atts.size();
+                        if (uNumAttachments > MAX_SATA_PORTS)
                         {
-                            LogRel(("Number of Sata Port Attachments > Max=%d.\n", u32NumAttachments));
-                            u32NumAttachments =  MAX_SATA_PORTS;
+                            LogRel(("Number of Sata Port Attachments > Max=%d.\n", uNumAttachments));
+                            uNumAttachments =  MAX_SATA_PORTS;
                         }
 
@@ -1662 +1662 @@
                          * HD is attached.
                          */
-                        for (size_t j = 0; j < u32NumAttachments; ++j)
+                        for (size_t j = 0; j < uNumAttachments; ++j)
                         {
                             IMediumAttachment *pMediumAtt = atts[j];
-                            hrc = pMediumAtt->COMGETTER(Port)(&iPortNum);                   H();
+                            hrc = pMediumAtt->COMGETTER(Port)(&lPortNum);                   H();
                             if(SUCCEEDED(hrc))
                                 hrc = pMediumAtt->COMGETTER(Type)(&lType);                    H();
@@ -1671 +1671 @@
                                 {
                                     /* find min port number used for HD */
-                                    if(iPortNum < u32PortLUN[0])
-                                        u32PortLUN[0] = iPortNum;
-                                    u32PortUsed[u32HDSataPortCount++] = iPortNum;
+                                    if(lPortNum < lPortLUN[0])
+                                        lPortLUN[0] = lPortNum;
+                                    lPortUsed[u32HDSataPortCount++] = lPortNum;
                                     LogFlowFunc(("HD Sata port Count=%d\n", u32HDSataPortCount));
                                 }
@@ -1685 +1685 @@
                             u32MaxPortCount = u32HDSataPortCount;
                         for (size_t i = 1; i < u32MaxPortCount; i++)
-                            u32PortLUN[i] = GetNextUsedSataPort(u32PortUsed,
-                                                                u32PortLUN[i-1],
-                                                                u32HDSataPortCount);
+                            lPortLUN[i] = GetNextUsedSataPort(lPortUsed,
+                                                              lPortLUN[i-1],
+                                                              u32HDSataPortCount);
                         if (pBiosCfg)
-                            for (j = 0; j < u32MaxPortCount; j++)
+                            for (size_t j = 0; j < u32MaxPortCount; j++)
                             {
-                                InsertConfigInteger(pBiosCfg, s_apszBiosConfig[j], u32PortLUN[j]);
-                                LogFlowFunc(("Top %d ports = %s, %d\n", j, s_apszBiosConfig[j], u32PortLUN[j]));
+                                InsertConfigInteger(pBiosCfg, s_apszBiosConfig[j], lPortLUN[j]);
+                                LogFlowFunc(("Top %d ports = %s, %d\n", j, s_apszBiosConfig[j], lPortLUN[j]));
                             }
                     }