Changeset 40109 in vbox for trunk/src

Timestamp:

Feb 13, 2012 9:11:46 PM (13 years ago)

Author:

vboxsync

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

76250

Message:

HostServices/SharedFolders: clearer code.

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -831 +831 @@
     if (RT_SUCCESS(rc))
     {
+        rc = VERR_NO_MEMORY;  /* Default error. */
         handle  = vbsfAllocFileHandle(pClient);
-    }
-    if (SHFL_HANDLE_NIL != handle)
-    {
-        rc = VERR_NO_MEMORY;  /* If this fails - rewritten immediately on success. */
-        pHandle = vbsfQueryFileHandle(pClient, handle);
-    }
-    if (0 != pHandle)
-    {
-        rc = RTFileOpen(&pHandle->file.Handle, pszPath, fOpen);
+        if (handle != SHFL_HANDLE_NIL)
+        {
+            pHandle = vbsfQueryFileHandle(pClient, handle);
+            if (pHandle)
+            {
+                rc = RTFileOpen(&pHandle->file.Handle, pszPath, fOpen);
+            }
+        }
     }
     if (RT_FAILURE(rc))
@@ -893 +893 @@
         }
     }
-
-    if (RT_SUCCESS(rc))
+    else
     {
         /** @note The shared folder status code is very approximate, as the runtime
@@ -948 +947 @@
         }
     }
+    /* Free resources if any part of the function has failed. */
     if (RT_FAILURE(rc))
     {