Changeset 21079 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Jun 30, 2009 3:59:22 PM (15 years ago)

Author:

vboxsync

Message:

Main: move libxml2 to IPRT unconditionally (remove VBOX_WITH_LIBXML2_IN_VBOXRT); move xml classes to IPRT; introduce IPRT ministring class as base for both Utf8Str and xml.cpp, with better performance; introduce some Utf8Str helpers to avoid string buffer hacks in Main code; remove std::auto_ptr<> from some headers

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -26 +26 @@
 #include <iprt/file.h>
 #include <iprt/s3.h>
+#include "iprt/xml_cpp.h"
 
 #include <VBox/param.h>
@@ -39 +40 @@
 
 #include "Logging.h"
-
-#include "VBox/xml.h"
 
 using namespace std;
@@ -234 +233 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
-
-static Utf8Str stripFilename(const Utf8Str &strFile)
-{
-    Utf8Str str2(strFile);
-    RTPathStripFilename(str2.mutableRaw());
-    return str2;
-}
 
 static const struct
@@ -2246 +2238 @@
                     /* The disk image has to be on the same place as the OVF file. So
                      * strip the filename out of the full file path. */
-                    Utf8Str strSrcDir = stripFilename(pAppliance->m->strPath);
+                    Utf8Str strSrcDir(pAppliance->m->strPath);
+                    strSrcDir.stripFilename();
 
                     /* Iterate over all given disk images */
@@ -3522 +3515 @@
             const Utf8Str &strTargetFileNameOnly = pDiskEntry->strOvf;
             // target path needs to be composed from where the output OVF is
-            Utf8Str strTargetFilePath = stripFilename(m->strPath);
+            Utf8Str strTargetFilePath(m->strPath);
+            strTargetFilePath.stripFilename();
             strTargetFilePath.append("/");
             strTargetFilePath.append(strTargetFileNameOnly);
@@ -3721 +3715 @@
                 const Utf8Str &strTargetFileNameOnly = (*itH)->strOvf;
                 /* Target path needs to be composed from where the output OVF is */
-                Utf8Str strTargetFilePath = stripFilename(m->strPath);
+                Utf8Str strTargetFilePath(m->strPath);
+                strTargetFilePath.stripFilename();
                 strTargetFilePath.append("/");
                 strTargetFilePath.append(strTargetFileNameOnly);
@@ -4736 +4731 @@
 
             Utf8Str strTargetVmdkName(bstrName);
-            RTPathStripExt(strTargetVmdkName.mutableRaw());
+            strTargetVmdkName.stripExt();
             strTargetVmdkName.append(".vmdk");