Changeset 27367 in vbox for trunk

Timestamp:

Mar 15, 2010 3:10:45 PM (15 years ago)

Author:

vboxsync

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

58812

Message:

VBoxHDD: -Wshadow warnings

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -1705 +1705 @@
         {
             /* Error detected, but image opened. Close and delete image. */
-            int rc2;
             rc2 = pImage->Backend->pfnClose(pImage->pvBackendData, true);
             AssertRC(rc2);
@@ -2934 +2933 @@
             vdRemoveImageFromList(pDisk, pImage);
             /* Close image. */
-            int rc2 = pImage->Backend->pfnClose(pImage->pvBackendData, false);
+            rc2 = pImage->Backend->pfnClose(pImage->pvBackendData, false);
             if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
                 rc = rc2;
@@ -3393 +3392 @@
 
                 /* Cache new geometry values in any case. */
-                int rc2 = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
-                                                              &pDisk->PCHSGeometry);
+                rc2 = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData,
+                                                          &pDisk->PCHSGeometry);
                 if (RT_FAILURE(rc2))
                 {
@@ -3561 +3560 @@
 
                 /* Cache new geometry values in any case. */
-                int rc2 = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
-                                                              &pDisk->LCHSGeometry);
+                rc2 = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData,
+                                                          &pDisk->LCHSGeometry);
                 if (RT_FAILURE(rc2))
                 {