Changeset 33598 in vbox

Timestamp:

Oct 29, 2010 11:08:42 AM (14 years ago)

Author:

vboxsync

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

67209

Message:

Main: use RTPATH_MAX and RTPathUserHome() wrapper

Location:

trunk/src/VBox/Main

Files:

• SystemPropertiesImpl.cpp (modified) (2 diffs)
• include/SystemPropertiesImpl.h (modified) (1 diff)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -950 +950 @@
 
 /**
+ * Returns the user's home directory. Wrapper around RTPathUserHome().
+ * @param strPath
+ * @return
+ */
+HRESULT SystemProperties::getUserHomeDirectory(Utf8Str &strPath)
+{
+    char szHome[RTPATH_MAX];
+    int vrc = RTPathUserHome(szHome, sizeof(szHome));
+    if (RT_FAILURE(vrc))
+        return setError(E_FAIL,
+                        tr("Cannot determine user home directory (%Rrc)"),
+                        vrc);
+    strPath = szHome;
+    return S_OK;
+}
+
+/**
  * Internal implementation to set the default machine folder. Gets called
  * from the public attribute setter as well as loadSettings(). With 4.0,
@@ -967 +984 @@
     {
         // new default with VirtualBox 4.0: "$HOME/VirtualBox VMs"
-        char szHome[200]; // RTPATH_MAX is ridiculously large
-        int vrc = RTPathUserHome(szHome, sizeof(szHome));
-        if (RT_FAILURE(vrc))
-            return setError(E_FAIL,
-                            tr("Cannot determine user home directory (%Rrc)"),
-                            vrc);
-
-        path = szHome;
+        HRESULT rc = getUserHomeDirectory(path);
+        if (FAILED(rc)) return rc;
         path += RTPATH_SLASH_STR "VirtualBox VMs";
     }

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

@@ -118 +118 @@
     typedef std::list<ComObjPtr<MediumFormat> > MediumFormatList;
 
+    HRESULT getUserHomeDirectory(Utf8Str &strPath);
     HRESULT setDefaultMachineFolder(const Utf8Str &aPath);
     HRESULT setDefaultHardDiskFormat(const Utf8Str &aFormat);