Changeset 31482 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 9, 2010 12:55:33 PM (15 years ago)

Author:

vboxsync

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

64564

Message:

Main: less string copying with media paths

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (5 diffs)
• VirtualBoxImpl.cpp (modified) (6 diffs)
• include/MediumImpl.h (modified) (1 diff)
• include/VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -481 +481 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    Utf8Str strConfigFile(aParent->getDefaultMachineFolder());
-    strConfigFile.append(Utf8StrFmt("%c%s%c%s.xml",
-                                    RTPATH_DELIMITER,
-                                    strName.c_str(),
-                                    RTPATH_DELIMITER,
-                                    strName.c_str()));
+    Utf8Str strConfigFile;
+    aParent->getDefaultMachineFolder(strConfigFile);
+    strConfigFile.append(RTPATH_DELIMITER);
+    strConfigFile.append(strName);
+    strConfigFile.append(RTPATH_DELIMITER);
+    strConfigFile.append(strName);
+    strConfigFile.append(".xml");
 
     HRESULT rc = initImpl(aParent, strConfigFile);

trunk/src/VBox/Main/MediumImpl.cpp

@@ -3063 +3063 @@
  *                      the specified location, and -1 otherwise.
  */
-HRESULT Medium::compareLocationTo(const char *aLocation, int &aResult)
+HRESULT Medium::compareLocationTo(const Utf8Str &strLocation, int &aResult)
 {
     AutoCaller autoCaller(this);
@@ -3076 +3076 @@
     if (m->formatObj->getCapabilities() & MediumFormatCapabilities_File)
     {
-        Utf8Str location(aLocation);
+        Utf8Str location;
 
         /* For locations represented by files, append the default path if
          * only the name is given, and then get the full path. */
-        if (!RTPathHavePath(aLocation))
-        {
-            location = Utf8StrFmt("%s%c%s",
-                                  m->pVirtualBox->getDefaultHardDiskFolder().raw(),
-                                  RTPATH_DELIMITER,
-                                  aLocation);
-        }
+        if (!RTPathHavePath(strLocation.c_str()))
+        {
+            m->pVirtualBox->getDefaultHardDiskFolder(location);
+            location.append(RTPATH_DELIMITER);
+            location.append(strLocation);
+        }
+        else
+            location = strLocation;
 
         int vrc = m->pVirtualBox->calculateFullPath(location, location);
@@ -3098 +3099 @@
     }
     else
-        aResult = locationFull.compare(aLocation);
+        aResult = locationFull.compare(strLocation);
 
     return S_OK;
@@ -3204 +3205 @@
     /* check that our own format supports diffs */
     if (!(m->formatObj->getCapabilities() & MediumFormatCapabilities_Differencing))
+    {
         /* use the default format if not */
-        return m->pVirtualBox->getDefaultHardDiskFormat();
+        Utf8Str tmp;
+        m->pVirtualBox->getDefaultHardDiskFormat(tmp);
+        return tmp;
+    }
 
     /* m->strFormat is const, no need to lock */
@@ -3320 +3325 @@
         /* append the default folder if no path is given */
         if (!RTPathHavePath(location.c_str()))
-            location = Utf8StrFmt("%s%c%s",
-                                  m->pVirtualBox->getDefaultHardDiskFolder().raw(),
-                                  RTPATH_DELIMITER,
-                                  location.raw());
+        {
+            Utf8Str tmp;
+            m->pVirtualBox->getDefaultHardDiskFolder(tmp);
+            tmp.append(RTPATH_DELIMITER);
+            tmp.append(location);
+            location = tmp;
+        }
 
         /* get the full file name */

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1139 +1139 @@
     if (strSettingsFile.isEmpty())
         /* we use the non-full folder value below to keep the path relative */
-        strSettingsFile = getDefaultMachineFolder();
+        getDefaultMachineFolder(strSettingsFile);
 
     strSettingsFile = Utf8StrFmt("%s%c%ls%c%ls.xml",
@@ -1378 +1378 @@
     Utf8Str format(aFormat);
     if (format.isEmpty())
-        format = getDefaultHardDiskFormat();
+        getDefaultHardDiskFormat(format);
 
     HRESULT rc = E_FAIL;
@@ -2745 +2745 @@
             const ComObjPtr<Medium> &hd = (*it).second;
 
-            HRESULT rc = hd->compareLocationTo(location.c_str(), result);
+            HRESULT rc = hd->compareLocationTo(location, result);
             if (FAILED(rc)) return rc;
 
@@ -2979 +2979 @@
  * @return
  */
-Utf8Str VirtualBox::getDefaultMachineFolder() const
+void VirtualBox::getDefaultMachineFolder(Utf8Str &str) const
 {
     AutoReadLock propsLock(m->pSystemProperties COMMA_LOCKVAL_SRC_POS);
-    return m->pSystemProperties->m->strDefaultMachineFolder;
+    str = m->pSystemProperties->m->strDefaultMachineFolder;
 }
 
@@ -2990 +2990 @@
  * @return
  */
-Utf8Str VirtualBox::getDefaultHardDiskFolder() const
+void VirtualBox::getDefaultHardDiskFolder(Utf8Str &str) const
 {
     AutoReadLock propsLock(m->pSystemProperties COMMA_LOCKVAL_SRC_POS);
-    return m->pSystemProperties->m->strDefaultHardDiskFolder;
+    str = m->pSystemProperties->m->strDefaultHardDiskFolder;
 }
 
@@ -3001 +3001 @@
  * @return
  */
-Utf8Str VirtualBox::getDefaultHardDiskFormat() const
+void VirtualBox::getDefaultHardDiskFormat(Utf8Str &str) const
 {
     AutoReadLock propsLock(m->pSystemProperties COMMA_LOCKVAL_SRC_POS);
-    return m->pSystemProperties->m->strDefaultHardDiskFormat;
+    str = m->pSystemProperties->m->strDefaultHardDiskFormat;
 }
 

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

@@ -198 +198 @@
     HRESULT saveSettings(settings::Medium &data);
 
-    HRESULT compareLocationTo(const char *aLocation, int &aResult);
+    HRESULT compareLocationTo(const Utf8Str &strLocation, int &aResult);
 
     HRESULT createMediumLockList(bool fFailIfInaccessible,

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

@@ -242 +242 @@
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
-    Utf8Str getDefaultMachineFolder() const;
-    Utf8Str getDefaultHardDiskFolder() const;
-    Utf8Str getDefaultHardDiskFormat() const;
+    void getDefaultMachineFolder(Utf8Str &str) const;
+    void getDefaultHardDiskFolder(Utf8Str &str) const;
+    void getDefaultHardDiskFormat(Utf8Str &str) const;
 
     /** Returns the VirtualBox home directory */