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

Timestamp:

Dec 15, 2010 12:38:41 PM (14 years ago)

Author:

vboxsync

Message:

Main: more backslash conversion in settings read/write, so add generic methods to XML classes

Location:

trunk/src/VBox/Runtime

Files:

• common/string/ministring.cpp (modified) (1 diff)
• r3/xml.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -212 +212 @@
 
     return npos;
+}
+
+void MiniString::findReplace(char cFind, char cReplace)
+{
+    for (size_t i = 0; i < length(); ++i)
+    {
+        char *p = &m_psz[i];
+        if (*p == cFind)
+            *p = cReplace;
+    }
 }
 

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

@@ -831 +831 @@
     {
         str = pAttr->getValue();
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Like getAttributeValue (ministring variant), but makes sure that all backslashes
+ * are converted to forward slashes.
+ * @param pcszMatch
+ * @param str
+ * @return
+ */
+bool ElementNode::getAttributeValuePath(const char *pcszMatch, iprt::MiniString &str) const
+{
+    if (getAttributeValue(pcszMatch, str))
+    {
+        str.findReplace('\\', '/');
         return true;
     }
@@ -1054 +1072 @@
 
 /**
+ * Like setAttribute (ministring variant), but replaces all backslashes with forward slashes
+ * before calling that one.
+ * @param pcszName
+ * @param strValue
+ * @return
+ */
+AttributeNode* ElementNode::setAttributePath(const char *pcszName, const iprt::MiniString &strValue)
+{
+    iprt::MiniString strTemp(strValue);
+    strTemp.findReplace('\\', '/');
+    return setAttribute(pcszName, strTemp.c_str());
+}
+
+/**
  * Sets the given attribute; overloaded version for int32_t.
  *