Changeset 71846 in vbox

Timestamp:

Apr 12, 2018 12:12:17 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Added IGuestSession::i_getPathStyle() to also make it use from internal functions more easily.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -279 +279 @@
     int                     i_onRemove(void);
     int                     i_onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
+    PathStyle_T             i_getPathStyle(void);
     int                     i_startSession(int *pGuestRc);
     int                     i_startSessionAsync(void);

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

@@ -523 +523 @@
 HRESULT GuestSession::getPathStyle(PathStyle_T *aPathStyle)
 {
-    VBOXOSTYPE enmOsType = mParent->i_getGuestOSType();
-    if (    enmOsType < VBOXOSTYPE_DOS)
-    {
-        *aPathStyle = PathStyle_Unknown;
-        LogFlowFunc(("returns PathStyle_Unknown\n"));
-    }
-    else if (enmOsType < VBOXOSTYPE_Linux)
-    {
-        *aPathStyle = PathStyle_DOS;
-        LogFlowFunc(("returns PathStyle_DOS\n"));
-    }
-    else
-    {
-        *aPathStyle = PathStyle_UNIX;
-        LogFlowFunc(("returns PathStyle_UNIX\n"));
-    }
+    *aPathStyle = i_getPathStyle();
     return S_OK;
 }
@@ -1632 +1617 @@
 }
 
+PathStyle_T GuestSession::i_getPathStyle(void)
+{
+    VBOXOSTYPE enmOsType = mParent->i_getGuestOSType();
+    if (    enmOsType < VBOXOSTYPE_DOS)
+    {
+        LogFlowFunc(("returns PathStyle_Unknown\n"));
+        return PathStyle_Unknown;
+    }
+    else if (enmOsType < VBOXOSTYPE_Linux)
+    {
+        LogFlowFunc(("returns PathStyle_DOS\n"));
+        return PathStyle_DOS;
+    }
+    else
+    {
+        LogFlowFunc(("returns PathStyle_UNIX\n"));
+        return PathStyle_UNIX;
+    }
+
+    return PathStyle_Unknown;
+}
+
 int GuestSession::i_startSession(int *prcGuest)
 {