Changeset 107674 in vbox

Timestamp:

Jan 10, 2025 3:50:53 PM (2 months ago)

Author:

vboxsync

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

166766

Message:

src/VBox/Main/src-client/GuestSessionImplTasks.cpp: Fixed warnings found by Parfait (unread variable). Handling symbolic links is not implemented yet anyway. jiraref:VBP-1424

File:

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

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

@@ -1694 +1694 @@
 
         bool fCopyIntoExisting;
-        bool fFollowSymlinks;
-
         if (pList->mSourceSpec.enmType == FsObjType_Directory)
-        {
             fCopyIntoExisting = RT_BOOL(pList->mSourceSpec.fDirCopyFlags & DirectoryCopyFlag_CopyIntoExisting);
-            fFollowSymlinks   = RT_BOOL(pList->mSourceSpec.fDirCopyFlags & DirectoryCopyFlag_FollowLinks);
-        }
         else if (pList->mSourceSpec.enmType == FsObjType_File)
-        {
             fCopyIntoExisting = !RT_BOOL(pList->mSourceSpec.fFileCopyFlags & FileCopyFlag_NoReplace);
-            fFollowSymlinks   = RT_BOOL(pList->mSourceSpec.fFileCopyFlags & FileCopyFlag_FollowLinks);
-        }
         else
             AssertFailedBreakStmt(vrc = VERR_NOT_IMPLEMENTED);
@@ -1754 +1746 @@
         {
             LogFlowFunc(("Directory: fDirCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool -> fDstExist=%RTbool (%s)\n",
-                         pList->mSourceSpec.fDirCopyFlags, fCopyIntoExisting, fFollowSymlinks,
+                         pList->mSourceSpec.fDirCopyFlags, fCopyIntoExisting,
                          fDstExists, GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(dstFsObjInfo.Attr.fMode))));
 
@@ -1872 +1864 @@
         {
             LogFlowFunc(("File: fFileCopyFlags=%#x, fCopyIntoExisting=%RTbool, fFollowSymlinks=%RTbool -> fDstExist=%RTbool (%s)\n",
-                         pList->mSourceSpec.fFileCopyFlags, fCopyIntoExisting, fFollowSymlinks,
+                         pList->mSourceSpec.fFileCopyFlags, fCopyIntoExisting,
                          fDstExists, GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(dstFsObjInfo.Attr.fMode))));
 
@@ -2813 +2805 @@
 {
     int vrc = VINF_SUCCESS;
-    HRESULT hrc;
 
     if (osType == eOSType_Linux)
@@ -2839 +2830 @@
             vrc = runFileOnGuest(pSession, procInfo, true /* fSilent */);
             if (RT_FAILURE(vrc))
-                hrc = setUpdateErrorMsg(VBOX_E_GSTCTL_GUEST_ERROR,
-                                        Utf8StrFmt(tr("Files were installed, but user services were not reloaded automatically. "
-                                                      "Please consider rebooting the guest")));
+                setUpdateErrorMsg(VBOX_E_GSTCTL_GUEST_ERROR,
+                                  Utf8StrFmt(tr("Files were installed, but user services were not reloaded automatically. "
+                                                "Please consider rebooting the guest")));
         }
         else
-            hrc = setUpdateErrorMsg(VBOX_E_GSTCTL_GUEST_ERROR,
-                                    Utf8StrFmt(tr("Files were installed, but kernel modules were not reloaded automatically. "
-                                                  "Please consider rebooting the guest")));
+            setUpdateErrorMsg(VBOX_E_GSTCTL_GUEST_ERROR,
+                              Utf8StrFmt(tr("Files were installed, but kernel modules were not reloaded automatically. "
+                                            "Please consider rebooting the guest")));
     }