Changeset 91745 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 14, 2021 8:24:19 PM (3 years ago)

Author:

vboxsync

Message:

Main/GuestSessionImplTasks.cpp: Corrected NULL parameter name comment; removed unnecessary return statements and status checks.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (3 diffs)

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

@@ -2038 +2038 @@
 
 int GuestSessionTaskUpdateAdditions::copyFileToGuest(GuestSession *pSession, RTVFS hVfsIso,
-                                                     Utf8Str const &strFileSrc, const Utf8Str &strFileDst,
-                                                     bool fOptional)
+                                                     Utf8Str const &strFileSrc, const Utf8Str &strFileDst, bool fOptional)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -2081 +2080 @@
             else
             {
-                rc = fileCopyToGuestInner(strFileSrc, hVfsFile, strFileDst, dstFile,
-                                          FileCopyFlag_None, 0 /*cbOffset*/, cbSrcSize);
+                rc = fileCopyToGuestInner(strFileSrc, hVfsFile, strFileDst, dstFile, FileCopyFlag_None, 0 /*offCopy*/, cbSrcSize);
 
                 int rc2 = dstFile->i_closeFile(&rcGuest);
@@ -2090 +2088 @@
 
         RTVfsFileRelease(hVfsFile);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
-    else
-    {
-        if (fOptional)
-            return VINF_SUCCESS;
-
-        return rc;
-    }
+    }
+    else if (fOptional)
+        rc = VINF_SUCCESS;
 
     return rc;