Changeset 27918 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Mar 31, 2010 5:10:40 PM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: import vbox:Machine XML within OVF, first batch (XML is parsed and machine config created, but COM Machine can't handle it yet)

File:

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

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

@@ -506 +506 @@
 }
 
-bool Node::nameEquals(const char *pcsz) const
+/**
+ * Variant of nameEquals that checks the namespace as well.
+ * @param pcszNamespace
+ * @param pcsz
+ * @return
+ */
+bool Node::nameEquals(const char *pcszNamespace, const char *pcsz) const
 {
     if (m->pcszName == pcsz)
@@ -514 +520 @@
     if (pcsz == NULL)
         return false;
-    return !strcmp(m->pcszName, pcsz);
-}
-
+    if (strcmp(m->pcszName, pcsz))
+        return false;
+
+    // name matches: then check namespaces as well
+    if (!pcszNamespace)
+        return true;
+    // caller wants namespace:
+    if (    !m->plibNode->ns
+         || !m->plibNode->ns->prefix
+         || !*m->plibNode->ns->prefix
+       )
+        // but node has no namespace:
+        return false;
+    return !strcmp((const char*)m->plibNode->ns->prefix, pcszNamespace);
+}
 
 /**
@@ -663 +681 @@
 /**
  * Returns the first child element whose name matches pcszMatch.
- * @param pcszMatch
+ *
+ * @param pcszNamespace Namespace prefix (e.g. "vbox") or NULL to match any namespace.
+ * @param pcszMatch Element name to match.
  * @return
  */
-const ElementNode* ElementNode::findChildElement(const char *pcszMatch)
+const ElementNode* ElementNode::findChildElement(const char *pcszNamespace,
+                                                 const char *pcszMatch)
     const
 {
@@ -679 +700 @@
         {
             ElementNode *pelm = static_cast<ElementNode*>((*it).get());
-            if (!strcmp(pcszMatch, pelm->getName())) // the element name matches
+            if (pelm->nameEquals(pcszNamespace, pcszMatch))
                 return pelm;
         }