Changeset 32311 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 8, 2010 11:41:47 AM (14 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuestR0Lib: shadow declaration.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c

@@ -222 +222 @@
         rc         = data.callInfo.result;
     }
-    else
-    if (rc == VERR_NOT_IMPLEMENTED)
+    else if (rc == VERR_NOT_IMPLEMENTED)
     {
         /* try the legacy interface too; temporary to assure backwards compatibility */
-        VBoxSFMapFolder_Old data;
-
-        VBOX_INIT_CALL(&data.callInfo, MAP_FOLDER_OLD, pClient);
-
-        data.path.type                    = VMMDevHGCMParmType_LinAddr;
-        data.path.u.Pointer.size          = ShflStringSizeOfBuffer (szFolderName);
-        data.path.u.Pointer.u.linearAddr  = (uintptr_t)szFolderName;
-
-        data.root.type                    = VMMDevHGCMParmType_32bit;
-        data.root.u.value32               = 0;
-
-        data.delimiter.type               = VMMDevHGCMParmType_32bit;
-        data.delimiter.u.value32          = RTPATH_DELIMITER;
-
-        rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+        VBoxSFMapFolder_Old OldData;
+
+        VBOX_INIT_CALL(&OldData.callInfo, MAP_FOLDER_OLD, pClient);
+
+        OldData.path.type                    = VMMDevHGCMParmType_LinAddr;
+        OldData.path.u.Pointer.size          = ShflStringSizeOfBuffer (szFolderName);
+        OldData.path.u.Pointer.u.linearAddr  = (uintptr_t)szFolderName;
+
+        OldData.root.type                    = VMMDevHGCMParmType_32bit;
+        OldData.root.u.value32               = 0;
+
+        OldData.delimiter.type               = VMMDevHGCMParmType_32bit;
+        OldData.delimiter.u.value32          = RTPATH_DELIMITER;
+
+        rc = VbglHGCMCall (pClient->handle, &OldData.callInfo, sizeof (OldData));
 
         if (RT_SUCCESS (rc))
         {
-            pMap->root = data.root.u.value32;
-            rc         = data.callInfo.result;
+            pMap->root = OldData.root.u.value32;
+            rc         = OldData.callInfo.result;
         }
     }