Changeset 41443 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

May 25, 2012 7:52:59 AM (13 years ago)

Author:

vboxsync

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

78174

Message:

Additions/SharedFolders: better error handling of VbglR3SharedFolderGetMappings()

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp ¶

@@ -36 +36 @@
         rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
                                            &paMappings, &cMappings);
-        if (RT_SUCCESS(rc) && cMappings)
+        if (RT_SUCCESS(rc))
         {
 #if 0
@@ -122 +122 @@
             }
 #endif
-            RTMemFree(paMappings);
+            VbglR3SharedFolderFreeMappings(paMappings);
         }
-        else if (RT_FAILURE(rc))
+        else
             Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
         VbglR3SharedFolderDisconnect(u32ClientId);
@@ -144 +144 @@
         rc = VbglR3SharedFolderGetMappings(u32ClientId, true /* Only process auto-mounted folders */,
                                            &paMappings, &cMappings);
-        if (RT_SUCCESS(rc) && cMappings)
+        if (RT_SUCCESS(rc))
         {
             for (uint32_t i = 0; i < cMappings && RT_SUCCESS(rc); i++)
@@ -190 +190 @@
                          paMappings[i].u32Root, rc));
             }
-            RTMemFree(paMappings);
+            VbglR3SharedFolderFreeMappings(paMappings);
         }
-        else if (cMappings)
+        else
             Log(("VBoxTray: Error while getting the shared folder mappings, rc = %Rrc\n", rc));
         VbglR3SharedFolderDisconnect(u32ClientId);