Changeset 21077 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Jun 30, 2009 3:19:12 PM (15 years ago)

Author:

vboxsync

Message:

back out r49329, r49331, will start over

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3450 +3450 @@
     AssertReturn (!mData->mConfigFileFull.isNull(), VERR_GENERAL_FAILURE);
 
-    Utf8Str strSettingsDir = mData->mConfigFileFull;
-
-    strSettingsDir.stripFilename();
-    char folder[RTPATH_MAX];
-    int vrc = RTPathAbsEx(strSettingsDir, aPath, folder, sizeof(folder));
-    if (RT_SUCCESS(vrc))
+    Utf8Str settingsDir = mData->mConfigFileFull;
+
+    RTPathStripFilename (settingsDir.mutableRaw());
+    char folder [RTPATH_MAX];
+    int vrc = RTPathAbsEx (settingsDir, aPath, folder, sizeof (folder));
+    if (RT_SUCCESS (vrc))
         aResult = folder;
 
@@ -3483 +3483 @@
     Utf8Str settingsDir = mData->mConfigFileFull;
 
-    settingsDir.stripFilename();
-    if (RTPathStartsWith(aPath, settingsDir))
+    RTPathStripFilename (settingsDir.mutableRaw());
+    if (RTPathStartsWith (aPath, settingsDir))
     {
         /* when assigning, we create a separate Utf8Str instance because both
@@ -3491 +3491 @@
          * first, and since its the same as aPath, an attempt to copy garbage
          * will be made. */
-        aResult = Utf8Str(aPath + settingsDir.length() + 1);
+        aResult = Utf8Str (aPath + settingsDir.length() + 1);
     }
 }
@@ -5949 +5949 @@
             /* first, rename the directory if it matches the machine name */
             configDir = configFile;
-            configDir.stripFilename();
+            RTPathStripFilename (configDir.mutableRaw());
             newConfigDir = configDir;
-            if (RTPathFilename(configDir) == name)
+            if (RTPathFilename (configDir) == name)
             {
-                newConfigDir.stripFilename();
+                RTPathStripFilename (newConfigDir.mutableRaw());
                 newConfigDir = Utf8StrFmt ("%s%c%s",
                     newConfigDir.raw(), RTPATH_DELIMITER, newName.raw());
@@ -6078 +6078 @@
 
         /* ensure the settings directory exists */
-        Utf8Str path(mData->mConfigFileFull);
-        path.stripFilename();
-        if (!RTDirExists(path))
-        {
-            vrc = RTDirCreateFullPath(path, 0777);
-            if (RT_FAILURE(vrc))
+        Utf8Str path = mData->mConfigFileFull;
+        RTPathStripFilename (path.mutableRaw());
+        if (!RTDirExists (path))
+        {
+            vrc = RTDirCreateFullPath (path, 0777);
+            if (RT_FAILURE (vrc))
             {
                 return setError (E_FAIL,
@@ -7655 +7655 @@
  *  @note Not thread safe (must be called from this object's lock).
  */
-bool Machine::isInOwnDir(Utf8Str *aSettingsDir /* = NULL */)
+bool Machine::isInOwnDir (Utf8Str *aSettingsDir /* = NULL */)
 {
     Utf8Str settingsDir = mData->mConfigFileFull;
-    settingsDir.stripFilename();
-    char *dirName = RTPathFilename(settingsDir);
+    RTPathStripFilename (settingsDir.mutableRaw());
+    char *dirName = RTPathFilename (settingsDir);
 
     AssertReturn (dirName, false);