Changeset 43806 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 5, 2012 5:41:26 PM (12 years ago)

Author:

vboxsync

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

81821

Message:

Main/ConsoleImpl2: build fix for ancient gcc versions (see r81663, lnx32-rel)

File:

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

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

@@ -1632 +1632 @@
                         { "SataLUN1", "SataLUN2", "SataLUN3", "SataLUN4" };
 
-                        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;
-                        size_t uNumAttachments = 0;
-                        DeviceType_T lType;
-                        com::SafeIfaceArray<IMediumAttachment> atts;
 
                         /* init to max value */
@@ -1649 +1644 @@
                         }
 
-
+                        com::SafeIfaceArray<IMediumAttachment> atts;
                         hrc = pMachine->GetMediumAttachmentsOfController(controllerName.raw(),
                                                             ComSafeArrayAsOutParam(atts));  H();
-                        uNumAttachments = atts.size();
+                        size_t uNumAttachments = atts.size();
                         if (uNumAttachments > MAX_SATA_PORTS)
                         {
@@ -1665 +1660 @@
                         {
                             IMediumAttachment *pMediumAtt = atts[j];
+                            LONG lPortNum = 0;
                             hrc = pMediumAtt->COMGETTER(Port)(&lPortNum);                   H();
                             if(SUCCEEDED(hrc))
+                            {
+                                DeviceType_T lType;
                                 hrc = pMediumAtt->COMGETTER(Type)(&lType);                    H();
                                 if(SUCCEEDED(hrc) && lType == DeviceType_HardDisk)
@@ -1676 +1674 @@
                                     LogFlowFunc(("HD Sata port Count=%d\n", u32HDSataPortCount));
                                 }
+                             }
                         }
 
@@ -1682 +1681 @@
                          * to save details for every 30 ports
                          */
+                        uint32_t u32MaxPortCount = MAX_SATA_LUN_COUNT;
                         if (u32HDSataPortCount < MAX_SATA_LUN_COUNT)
                             u32MaxPortCount = u32HDSataPortCount;
@@ -1689 +1689 @@
                                                               u32HDSataPortCount);
                         if (pBiosCfg)
+                        {
                             for (size_t j = 0; j < u32MaxPortCount; j++)
                             {
@@ -1694 +1695 @@
                                 LogFlowFunc(("Top %d ports = %s, %d\n", j, s_apszBiosConfig[j], lPortLUN[j]));
                             }
+                        }
                     }