Changeset 77069 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jan 31, 2019 11:59:33 AM (6 years ago)

Author:

vboxsync

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

128519

Message:

Guest Control/Main: Check flags of IGuestSession::directoryRemoveRecursive() and renamed DIRREMOVE_FLAG_ flags to DIRREMOVEREC_FLAG_ to match usage.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -137 +137 @@
          * Do some validating before executing the job.
          */
-        if (!(fFlags & ~DIRREMOVE_FLAG_VALID_MASK))
-        {
-            if (fFlags & DIRREMOVE_FLAG_RECURSIVE)
+        if (!(fFlags & ~DIRREMOVEREC_FLAG_VALID_MASK))
+        {
+            if (fFlags & DIRREMOVEREC_FLAG_RECURSIVE)
             {
                 uint32_t fFlagsRemRec = RTDIRRMREC_F_CONTENT_AND_DIR; /* Set default. */
-                if (fFlags & DIRREMOVE_FLAG_CONTENT_ONLY)
+                if (fFlags & DIRREMOVEREC_FLAG_CONTENT_ONLY)
                     fFlagsRemRec |= RTDIRRMREC_F_CONTENT_ONLY;
                 rc = RTDirRemoveRecursive(szDir, fFlagsRemRec);
@@ -156 +156 @@
         else
         {
-            VGSvcError("[Dir %s]: Unsupported flags: %#x (all %#x)\n", szDir, (fFlags & ~DIRREMOVE_FLAG_VALID_MASK), fFlags);
+            VGSvcError("[Dir %s]: Unsupported flags: %#x (all %#x)\n", szDir, (fFlags & ~DIRREMOVEREC_FLAG_VALID_MASK), fFlags);
             rc = VERR_NOT_SUPPORTED;
         }