Changeset 104001 in vbox for trunk/src/VBox

Timestamp:

Mar 22, 2024 4:03:33 PM (12 months ago)

Author:

vboxsync

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

162388

Message:

Guest Control/Main: Renaming (removed "File" from some internal GuestFile APIs; unnecessary).

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -69 +69 @@
     /** @name Public internal methods.
      * @{ */
-    int             i_closeFile(int *pGuestRc);
+    int             i_close(int *pGuestRc);
     EventSource    *i_getEventSource(void) { return mEventSource; }
-    int             i_onFileNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
+    int             i_onNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
     int             i_onGuestDisconnected(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
-    int             i_openFile(uint32_t uTimeoutMS, int *pGuestRc);
+    int             i_open(uint32_t uTimeoutMS, int *pGuestRc);
     int             i_queryInfo(GuestFsObjData &objData, int *prcGuest);
     int             i_readData(uint32_t uSize, uint32_t uTimeoutMS, void* pvData, uint32_t cbData, uint32_t* pcbRead);

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

@@ -368 +368 @@
 
         case GUEST_MSG_FILE_NOTIFY:
-            vrc = i_onFileNotify(pCbCtx, pSvcCb);
+            vrc = i_onNotify(pCbCtx, pSvcCb);
             break;
 
@@ -391 +391 @@
  *                              was returned.
  */
-int GuestFile::i_closeFile(int *prcGuest)
+int GuestFile::i_close(int *prcGuest)
 {
     LogFlowThisFunc(("strFile=%s\n", mData.mOpenInfo.mFilename.c_str()));
@@ -473 +473 @@
  * @param   pSvcCbData          Host callback data.
  */
-int GuestFile::i_onFileNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData)
+int GuestFile::i_onNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData)
 {
     AssertPtrReturn(pCbCtx, VERR_INVALID_POINTER);
@@ -792 +792 @@
  *                              was returned. Optional.
  */
-int GuestFile::i_openFile(uint32_t uTimeoutMS, int *prcGuest)
+int GuestFile::i_open(uint32_t uTimeoutMS, int *prcGuest)
 {
     AssertReturn(mData.mOpenInfo.mFilename.isNotEmpty(), VERR_INVALID_PARAMETER);
@@ -1528 +1528 @@
     /* Close file on guest. */
     int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_closeFile(&vrcGuest);
+    int vrc = i_close(&vrcGuest);
     if (RT_FAILURE(vrc))
     {

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

@@ -1990 +1990 @@
     {
         int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-        vrc = pFile->i_openFile(30 * 1000 /* 30s timeout */, &vrcGuest);
+        vrc = pFile->i_open(30 * 1000 /* 30s timeout */, &vrcGuest);
         if (   vrc == VERR_GSTCTL_GUEST_ERROR
             && pvrcGuest)

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

@@ -505 +505 @@
 {
     int vrcGuest;
-    int vrc = file->i_closeFile(&vrcGuest);
+    int vrc = file->i_close(&vrcGuest);
     if (RT_FAILURE(vrc))
     {