Changeset 17400 in vbox

Timestamp:

Mar 5, 2009 1:55:30 PM (16 years ago)

Author:

vboxsync

Message:

OVF: more XML write and export.

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• xml/xml.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2460 +2460 @@
         writer.write(pAppliance->m->strPath.c_str());
     }
+    catch(xml::Error &x)
+    {
+        rc = setError(VBOX_E_FILE_ERROR,
+                      x.what());
+    }
     catch(HRESULT aRC)
     {

trunk/src/VBox/Main/xml/xml.cpp

@@ -967 +967 @@
 }
 
-struct ReadWriteContext
+struct IOContext
 {
     File file;
     com::Utf8Str error;
 
-    ReadWriteContext(const char *pcszFilename)
-        : file(File::Mode_Read, pcszFilename)     // @todo must be write for writer
+    IOContext(const char *pcszFilename, File::Mode mode)
+        : file(mode, pcszFilename)
     {
     }
@@ -985 +985 @@
     {
         error = x.what();
+    }
+};
+
+struct ReadContext : IOContext
+{
+    ReadContext(const char *pcszFilename)
+        : IOContext(pcszFilename, File::Mode_Read)
+    {
+    }
+};
+
+struct WriteContext : IOContext
+{
+    WriteContext(const char *pcszFilename)
+        : IOContext(pcszFilename, File::Mode_Write)
+    {
     }
 };
@@ -1005 +1021 @@
     m->strXmlFilename = pcszFilename;
 
-    ReadWriteContext context(pcszFilename);
+    ReadContext context(pcszFilename);
     doc.m->reset();
     if (!(doc.m->plibDocument = xmlCtxtReadIO(m->ctxt,
@@ -1022 +1038 @@
 int XmlFileParser::ReadCallback(void *aCtxt, char *aBuf, int aLen)
 {
-    ReadWriteContext *pContext = static_cast<ReadWriteContext*>(aCtxt);
+    ReadContext *pContext = static_cast<ReadContext*>(aCtxt);
 
     /* To prevent throwing exceptions while inside libxml2 code, we catch
@@ -1068 +1084 @@
 }
 
-int XmlFileWriter::WriteCallback(void *aCtxt, const char *aBuf, int aLen)
-{
-    ReadWriteContext *pContext = static_cast<ReadWriteContext*>(aCtxt);
-
-    /* To prevent throwing exceptions while inside libxml2 code, we catch
-     * them and forward to our level using a couple of variables. */
-    try
-    {
-        return pContext->file.write(aBuf, aLen);
-    }
-    catch (const xml::EIPRTFailure &err) { pContext->setError(err); }
-    catch (const xml::Error &err) { pContext->setError(err); }
-    catch (const std::exception &err) { pContext->setError(err); }
-    catch (...) { pContext->setError(xml::LogicError(RT_SRC_POS)); }
-
-    return -1 /* failure */;
-}
-
-int XmlFileWriter::CloseCallback(void *aCtxt)
-{
-    /// @todo to be written
-
-    return -1;
-}
-
 void XmlFileWriter::write(const char *pcszFilename)
 {
-    ReadWriteContext context(pcszFilename);
+    WriteContext context(pcszFilename);
 
     GlobalLock lock();
@@ -1127 +1118 @@
 }
 
+int XmlFileWriter::WriteCallback(void *aCtxt, const char *aBuf, int aLen)
+{
+    WriteContext *pContext = static_cast<WriteContext*>(aCtxt);
+
+    /* To prevent throwing exceptions while inside libxml2 code, we catch
+     * them and forward to our level using a couple of variables. */
+    try
+    {
+        return pContext->file.write(aBuf, aLen);
+    }
+    catch (const xml::EIPRTFailure &err) { pContext->setError(err); }
+    catch (const xml::Error &err) { pContext->setError(err); }
+    catch (const std::exception &err) { pContext->setError(err); }
+    catch (...) { pContext->setError(xml::LogicError(RT_SRC_POS)); }
+
+    return -1 /* failure */;
+}
+
+int XmlFileWriter::CloseCallback(void *aCtxt)
+{
+    /// @todo to be written
+
+    return -1;
+}
+
 
 } // end namespace xml