Changeset 98610 in vbox

Timestamp:

Feb 16, 2023 10:44:38 PM (2 years ago)

Author:

vboxsync

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

155902

Message:

Main/GuestSession: nits and some logging. bugref:9783

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -58 +58 @@
 
 /** Vector holding a process' CPU affinity. */
-typedef std::vector <LONG> ProcessAffinity;
+typedef std::vector<LONG> ProcessAffinity;
 /** Vector holding process startup arguments. */
-typedef std::vector <Utf8Str> ProcessArguments;
+typedef std::vector<Utf8Str> ProcessArguments;
 
 class GuestToolboxStreamBlock;

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

@@ -942 +942 @@
  * @param   uFlags              Directory creation flags to use.
  * @param   pvrcGuest           Where to return the guest error when
- *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ *                              VERR_GSTCTL_GUEST_ERROR was returned.
  */
 int GuestSession::i_directoryCreate(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pvrcGuest)
 {
     AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
-
     LogFlowThisFunc(("strPath=%s, uMode=%x, uFlags=%x\n", strPath.c_str(), uMode, uFlags));
+    *pvrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
 
     int vrc = VINF_SUCCESS;
@@ -988 +988 @@
     }
     else
-    {
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
+    {
 #ifdef VBOX_WITH_GSTCTL_TOOLBOX_SUPPORT
         GuestProcessStartupInfo procInfo;
         procInfo.mFlags      = ProcessCreateFlag_Hidden;
-        procInfo.mExecutable = Utf8Str(VBOXSERVICE_TOOL_MKDIR);
+        procInfo.mExecutable = VBOXSERVICE_TOOL_MKDIR;
 
         try
@@ -1015 +1015 @@
                 char szMode[16];
                 if (RTStrPrintf(szMode, sizeof(szMode), "%o", uMode))
-                {
                     procInfo.mArguments.push_back(Utf8Str(szMode));
-                }
                 else
                     vrc = VERR_BUFFER_OVERFLOW;
@@ -1033 +1031 @@
             vrc = GuestProcessToolbox::run(this, procInfo, pvrcGuest);
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_SUPPORT */
-#ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
-    }
-#endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
-
-    LogFlowFuncLeaveRC(vrc);
+    }
+
+    LogFlowFunc(("LEAVE: %Rrc *pvrcGuest=%Rrc\n", vrc, pvrcGuest ? *pvrcGuest : -VERR_IPE_UNINITIALIZED_STATUS));
     return vrc;
 }