Improve xml parsing on diameter codec

[anna.git] / include / anna / diameter / codec / functions.hpp

diff --git a/include/anna/diameter/codec/functions.hpp b/include/anna/diameter/codec/functions.hpp
index 9c4c5a8..43dfa92 100644 (file)
--- a/include/anna/diameter/codec/functions.hpp
+++ b/include/anna/diameter/codec/functions.hpp
@@ -48,7 +48,7 @@ static const char *MessageDTD = "\
 <!ELEMENT message (avp*)>\n\
 <!ELEMENT avp (avp*)>\n\
 \n\
-<!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>\n\
+<!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>\n\
 <!--\n\
    version: Diameter version. Sets '1' by default\n\
    name:    Command name within working stack (dictionary identifier)\n\
@@ -65,7 +65,7 @@ static const char *MessageDTD = "\
 \n\
    application-id:   Message application id\n\
    hop-by-hop-id:    Message hop by hop id. Sets '0' by default\n\
-   end-by-end-id:    Message end by end id. Sets '0' by default\n\
+   end-to-end-id:    Message end to end id. Sets '0' by default\n\
 -->\n\
 \n\
 <!ATTLIST avp name CDATA #IMPLIED code CDATA #IMPLIED vendor-code CDATA #IMPLIED flags CDATA #IMPLIED data CDATA #IMPLIED hex-data CDATA #IMPLIED alias CDATA #IMPLIED>\n\
@@ -114,8 +114,6 @@ static const char *MessageDTD = "\
 ";
 
 
-
-
 // Used for alarms, tracing and Failed-AVP construction:
 typedef struct parent {
 
@@ -243,7 +241,7 @@ struct functions {
      <!ELEMENT message (avp*)>
      <!ELEMENT avp (avp*)>
 
-     <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+     <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
      <!--
         version: Diameter version. Sets '1' by default
         name:    Command name within working stack (dictionary identifier)
@@ -257,7 +255,7 @@ struct functions {
 
         application-id:   Message application id
         hop-by-hop-id:    Message hop by hop id. Sets '0' by default
-        end-by-end-id:    Message end by end id. Sets '0' by default
+        end-to-end-id:    Message end to end id. Sets '0' by default
      -->
 
      <!ATTLIST avp name CDATA #IMPLIED code CDATA #IMPLIED vendor-code CDATA #IMPLIED flags CDATA #IMPLIED data CDATA #IMPLIED hex-data CDATA #IMPLIED>
@@ -320,7 +318,7 @@ struct functions {
      For example, you could load the document to be decoded over a codec Message by mean #Message::fromXML (using
      the xml document #getRootNode) during document lifetime. After that, it could be destroyed.
    */
-  static void messageXmlDocumentFromXmlString(anna::xml::DocumentFile &xmlDocument, const std::string &xmlString) throw(anna::RuntimeException);
+  static void messageXmlDocumentFromXmlString(anna::xml::DocumentMemory &xmlDocument, const std::string &xmlString) throw(anna::RuntimeException);
 };