Changeset 22173 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 11, 2009 3:38:59 PM (16 years ago)

Author:

vboxsync

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

50951

Message:

Main: the big XML settings rework. Move XML reading/writing out of interface implementation code into separate layer so it can handle individual settings versions in the future.

File:

• trunk/src/VBox/Runtime/r3/xml.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -497 +497 @@
 }
 
+bool Node::nameEquals(const char *pcsz) const
+{
+    if (m->pcszName == pcsz)
+        return true;
+    if (m->pcszName == NULL)
+        return false;
+    if (pcsz == NULL)
+        return false;
+    return !strcmp(m->pcszName, pcsz);
+}
+
+
 /**
  * Returns the value of a node. If this node is an attribute, returns
@@ -732 +744 @@
 /**
  * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as a string.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param str out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, iprt::MiniString &str) const
+{
+    const Node* pAttr;
+    if ((pAttr = findAttribute(pcszMatch)))
+    {
+        str = pAttr->getValue();
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as a signed integer. This calls
+ * RTStrToInt32Ex internally and will only output the integer if that
+ * function returns no error.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param i out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, int32_t &i) const
+{
+    const char *pcsz;
+    if (    (getAttributeValue(pcszMatch, pcsz))
+         && (VINF_SUCCESS == RTStrToInt32Ex(pcsz, NULL, 0, &i))
+       )
+        return true;
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as an unsigned integer.This calls
+ * RTStrToUInt32Ex internally and will only output the integer if that
+ * function returns no error.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param i out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, uint32_t &i) const
+{
+    const char *pcsz;
+    if (    (getAttributeValue(pcszMatch, pcsz))
+         && (VINF_SUCCESS == RTStrToUInt32Ex(pcsz, NULL, 0, &i))
+       )
+        return true;
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
  * name and returns its value as a signed long integer. This calls
  * RTStrToInt64Ex internally and will only output the integer if that
@@ -744 +818 @@
     const char *pcsz;
     if (    (getAttributeValue(pcszMatch, pcsz))
-         && (VINF_SUCCESS == RTStrToInt64Ex(pcsz, NULL, 10, &i))
+         && (VINF_SUCCESS == RTStrToInt64Ex(pcsz, NULL, 0, &i))
        )
         return true;
@@ -765 +839 @@
     const char *pcsz;
     if (    (getAttributeValue(pcszMatch, pcsz))
-         && (VINF_SUCCESS == RTStrToUInt64Ex(pcsz, NULL, 10, &i))
+         && (VINF_SUCCESS == RTStrToUInt64Ex(pcsz, NULL, 0, &i))
        )
         return true;
+
+    return false;
+}
+
+/**
+ * Convenience method which attempts to find the attribute with the given
+ * name and returns its value as a boolean. This accepts "true", "false",
+ * "yes", "no", "1" or "0" as valid values.
+ *
+ * @param pcszMatch name of attribute to find.
+ * @param i out: attribute value
+ * @return TRUE if attribute was found and str was thus updated.
+ */
+bool ElementNode::getAttributeValue(const char *pcszMatch, bool &f) const
+{
+    const char *pcsz;
+    if (getAttributeValue(pcszMatch, pcsz))
+    {
+        if (    (!strcmp(pcsz, "true"))
+             || (!strcmp(pcsz, "yes"))
+             || (!strcmp(pcsz, "1"))
+           )
+        {
+            f = true;
+            return true;
+        }
+        if (    (!strcmp(pcsz, "false"))
+             || (!strcmp(pcsz, "no"))
+             || (!strcmp(pcsz, "0"))
+           )
+        {
+            f = false;
+            return true;
+        }
+    }
 
     return false;
@@ -870 +979 @@
 }
 
+AttributeNode* ElementNode::setAttribute(const char *pcszName, int32_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RI32", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint32_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RU32", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, int64_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RI64", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint64_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "%RU64", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttributeHex(const char *pcszName, uint32_t i)
+{
+    char *psz = NULL;
+    RTStrAPrintf(&psz, "0x%RX32", i);
+    AttributeNode *p = setAttribute(pcszName, psz);
+    RTStrFree(psz);
+    return p;
+}
+
+AttributeNode* ElementNode::setAttribute(const char *pcszName, bool f)
+{
+    return setAttribute(pcszName, (f) ? "true" : "false");
+}
 
 AttributeNode::AttributeNode()
@@ -910 +1068 @@
  * NULL, like this:
  * <code>
- *      xml::Node node;         // should point to an element
+ *      xml::ElementNode node;               // should point to an element
  *      xml::NodesLoop loop(node, "child");  // find all "child" elements under node
- *      const xml::Node *pChild = NULL;
+ *      const xml::ElementNode *pChild = NULL;
  *      while (pChild = loop.forAllNodes())
  *          ...;
@@ -1018 +1176 @@
 /**
  * Returns the root element of the document, or NULL if the document is empty.
+ * Const variant.
  * @return
  */
 const ElementNode* Document::getRootElement() const
+{
+    return m->pRootElement;
+}
+
+/**
+ * Returns the root element of the document, or NULL if the document is empty.
+ * Non-const variant.
+ * @return
+ */
+ElementNode* Document::getRootElement()
 {
     return m->pRootElement;
@@ -1151 +1320 @@
  * @param doc out: document to be reset and filled with data according to file contents.
  */
-void XmlFileParser::read(const char *pcszFilename,
+void XmlFileParser::read(const iprt::MiniString &strFilename,
                          Document &doc)
 {
@@ -1157 +1326 @@
 //     global.setExternalEntityLoader(ExternalEntityLoader);
 
-    m->strXmlFilename = pcszFilename;
+    m->strXmlFilename = strFilename;
+    const char *pcszFilename = strFilename.c_str();
 
     ReadContext context(pcszFilename);