Changeset 7027 in vbox for trunk/src/VBox/Main/xml/Settings.cpp

Timestamp:

Feb 20, 2008 10:30:22 AM (17 years ago)

Author:

vboxsync

Message:

Main/Settings: FromString <bool>: Recognize "0" and "1" and forget "on/off" and "yes/no" (to match XML Schema's definition of boolean).

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (7 diffs)

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

@@ -34 +34 @@
 
 
-/** 
+/**
  * Global module initialization structure.
  *
@@ -163 +163 @@
 
     if (strcmp (aValue, "true") == 0 ||
-        strcmp (aValue, "yes") == 0 ||
-        strcmp (aValue, "on") == 0)
+        strcmp (aValue, "1") == 0)
+        /* This contradicts the XML Schema's interpretation of boolean: */
+        //strcmp (aValue, "yes") == 0 ||
+        //strcmp (aValue, "on") == 0)
         return true;
     else if (strcmp (aValue, "false") == 0 ||
-             strcmp (aValue, "no") == 0 ||
-             strcmp (aValue, "off") == 0)
+             strcmp (aValue, "0") == 0)
+            /* This contradicts the XML Schema's interpretation of boolean: */
+            //strcmp (aValue, "no") == 0 ||
+            //strcmp (aValue, "off") == 0)
         return false;
 
@@ -284 +288 @@
                                                 unsigned int aExtra /* = 0 */)
 {
+    /* Convert to the canonical form according to XML Schema */
     stdx::char_auto_ptr result (duplicate_chars (aValue ? "true" : "false"));
     return result;
@@ -765 +770 @@
     }
 
-    /** 
+    /**
      * Composes a single message for the given error. The caller must free the
      * returned string using RTStrFree() when no more necessary.
@@ -928 +933 @@
 
             /* set our error handlers */
-            xmlSchemaSetParserErrors (schemaCtxt, ValidityErrorCallback, 
+            xmlSchemaSetParserErrors (schemaCtxt, ValidityErrorCallback,
                                       ValidityWarningCallback, &errorStr);
             xmlSchemaSetParserStructuredErrors (schemaCtxt,
@@ -1117 +1122 @@
 #endif
 
-        /* perform cleanup when necessary */ 
+        /* perform cleanup when necessary */
         if (ctxt->deleteStreamOnClose)
             delete ctxt->stream;
@@ -1215 +1220 @@
 
 /* static */
-xmlParserInputPtr XmlTreeBackend::ExternalEntityLoader (const char *aURI, 
-                                                        const char *aID, 
+xmlParserInputPtr XmlTreeBackend::ExternalEntityLoader (const char *aURI,
+                                                        const char *aID,
                                                         xmlParserCtxtPtr aCtxt)
 {