Changeset 78038 in vbox for trunk/src

Timestamp:

Apr 8, 2019 12:15:00 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Renaming.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -283 +283 @@
     inline bool             i_directoryExists(uint32_t uDirID, ComObjPtr<GuestDirectory> *pDir);
     int                     i_directoryUnregister(GuestDirectory *pDirectory);
-    int                     i_directoryRemove(const Utf8Str &strPath, uint32_t uFlags, int *pGuestRc);
+    int                     i_directoryRemove(const Utf8Str &strPath, uint32_t fFlags, int *pGuestRc);
     int                     i_directoryCreate(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pGuestRc);
     int                     i_directoryOpen(const GuestDirectoryOpenInfo &openInfo,

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

@@ -1023 +1023 @@
 }
 
-int GuestSession::i_directoryRemove(const Utf8Str &strPath, uint32_t uFlags, int *prcGuest)
-{
-    AssertReturn(!(uFlags & ~DIRREMOVEREC_FLAG_VALID_MASK), VERR_INVALID_PARAMETER);
+int GuestSession::i_directoryRemove(const Utf8Str &strPath, uint32_t fFlags, int *prcGuest)
+{
+    AssertReturn(!(fFlags & ~DIRREMOVEREC_FLAG_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
 
-    LogFlowThisFunc(("strPath=%s, uFlags=0x%x\n", strPath.c_str(), uFlags));
+    LogFlowThisFunc(("strPath=%s, uFlags=0x%x\n", strPath.c_str(), fFlags));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1043 +1043 @@
     HGCMSvcSetPv(&paParms[i++], (void*)strPath.c_str(),
                             (ULONG)strPath.length() + 1);
-    HGCMSvcSetU32(&paParms[i++], uFlags);
+    HGCMSvcSetU32(&paParms[i++], fFlags);
 
     alock.release(); /* Drop write lock before sending. */
@@ -3465 +3465 @@
 
     /* No flags; only remove the directory when empty. */
-    uint32_t uFlags = 0;
+    uint32_t fFlags = DIRREMOVEREC_FLAG_NONE;
 
     int rcGuest;
-    int vrc = i_directoryRemove(aPath, uFlags, &rcGuest);
+    int vrc = i_directoryRemove(aPath, fFlags, &rcGuest);
     if (RT_FAILURE(vrc))
     {