Changeset 16538 in vbox

Timestamp:

Feb 5, 2009 11:25:01 PM (16 years ago)

Author:

vboxsync

Message:

Main: replace redundant xml::FmtStr with com::Utf8StrFmt

Location:

trunk

Files:

• include/VBox/settings.h (modified) (4 diffs)
• include/VBox/xml.h (modified) (1 diff)
• src/VBox/Main/VirtualBoxBase.cpp (modified) (4 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (8 diffs)
• src/VBox/Main/xml/xml.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -47 +47 @@
 #include <VBox/xml.h>
 
-#include <stdarg.h>
+// #include <stdarg.h>
 
 
@@ -592 +592 @@
         catch (const ENoValue &)
         {
-            throw ENoValue(xml::FmtStr("No such attribute '%s'", aName));
+            throw ENoValue(com::Utf8StrFmt("No such attribute '%s'", aName));
         }
     }
@@ -647 +647 @@
         catch (const ENoValue &)
         {
-            throw ENoValue(xml::FmtStr("No value for attribute '%s'", aName));
+            throw ENoValue(com::Utf8StrFmt("No value for attribute '%s'", aName));
         }
     }
@@ -761 +761 @@
         if (key.isNull())
         {
-            throw ENoKey(xml::FmtStr("No such key '%s'", aName));
+            throw ENoKey(com::Utf8StrFmt("No such key '%s'", aName));
         }
         return key;

trunk/include/VBox/xml.h

@@ -101 +101 @@
 {
 
-// Helpers
-//////////////////////////////////////////////////////////////////////////////
-
-/**
- * Temporary holder for the formatted string.
- *
- * Instances of this class are used for passing the formatted string as an
- * argument to an Error constructor or to another function that takes
- * <tr>const char *</tr> and makes a copy of the string it points to.
- */
-class VBOXXML_CLASS FmtStr
-{
-public:
-
-    /**
-     * Creates a formatted string using the format string and a set of
-     * printf-like arguments.
-     */
-    FmtStr(const char *aFmt, ...)
-    {
-        va_list args;
-        va_start(args, aFmt);
-        RTStrAPrintfV(&mStr, aFmt, args);
-        va_end(args);
-    }
-
-    ~FmtStr() { RTStrFree (mStr); }
-
-    operator const char *() { return mStr; }
-
-private:
-
-    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP (FmtStr)
-
-    char *mStr;
-};
-
-
 // Exceptions
 //////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -21 +21 @@
  * additional information or have any questions.
  */
+
+#include <iprt/semaphore.h>
+#include <iprt/asm.h>
 
 #if !defined (VBOX_WITH_XPCOM)
@@ -34 +37 @@
 #include "VirtualBoxErrorInfoImpl.h"
 #include "Logging.h"
-
-#include <iprt/semaphore.h>
-#include <iprt/asm.h>
 
 // VirtualBoxBaseProto methods
@@ -1270 +1270 @@
         strlen (aValue) != RTUUID_STR_LENGTH + 1 ||
         aValue [RTUUID_STR_LENGTH] != '}')
-        throw ENoConversion(xml::FmtStr("'%s' is not Guid", aValue));
+        throw ENoConversion(com::Utf8StrFmt("'%s' is not Guid", aValue));
 
     /* strip { and } */
@@ -1280 +1280 @@
     int vrc = RTUuidFromStr (&uuid, buf);
     if (RT_FAILURE (vrc))
-        throw ENoConversion(xml::FmtStr("'%s' is not Guid (%Rrc)", aValue, vrc));
+        throw ENoConversion(com::Utf8StrFmt("'%s' is not Guid (%Rrc)", aValue, vrc));
 
     return com::Guid (uuid);

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

@@ -19 +19 @@
  */
 
-#include "VBox/settings.h"
-
-#include "Logging.h"
-
 #include <iprt/err.h>
 #include <iprt/file.h>
@@ -40 +36 @@
 #include <libxslt/xsltutils.h>
 
-#include <string.h>
-
+#include <list>
+
+// #include <string.h>
+
+#include "VBox/settings.h"
+
+#include "Logging.h"
 
 namespace settings
@@ -58 +59 @@
         return aChar - 'a' + 0xA;
 
-    throw ENoConversion(xml::FmtStr ("'%c' (0x%02X) is not hex", aChar, aChar));
+    throw ENoConversion(com::Utf8StrFmt("'%c' (0x%02X) is not hex", aChar, aChar));
 }
 
@@ -121 +122 @@
     }
 
-    throw ENoConversion(xml::FmtStr("'%s' is not integer", aValue));
+    throw ENoConversion(com::Utf8StrFmt("'%s' is not integer", aValue));
 }
 
@@ -142 +143 @@
         return false;
 
-    throw ENoConversion(xml::FmtStr("'%s' is not bool", aValue));
+    throw ENoConversion(com::Utf8StrFmt("'%s' is not bool", aValue));
 }
 
@@ -176 +177 @@
         }
         else
-            throw ENoConversion(xml::FmtStr("'%s' is not UTC date", aValue));
-    }
-
-    throw ENoConversion(xml::FmtStr("'%s' is not ISO date", aValue));
+            throw ENoConversion(com::Utf8StrFmt("'%s' is not UTC date", aValue));
+    }
+
+    throw ENoConversion(com::Utf8StrFmt("'%s' is not ISO date", aValue));
 }
 
@@ -192 +193 @@
     /* therefore, the original length must be even */
     if (len % 2 != 0)
-        throw ENoConversion(xml::FmtStr("'%.*s' is not binary data",
-                                        aLen, aValue));
+        throw ENoConversion(com::Utf8StrFmt("'%.*s' is not binary data",
+                                            aLen, aValue));
 
     stdx::char_auto_ptr result (new char [len]);
@@ -265 +266 @@
     RTTIME time;
     if (!RTTimeExplode (&time, &aValue))
-        throw ENoConversion(xml::FmtStr("timespec %lld ms is invalid",
-                                        RTTimeSpecGetMilli (&aValue)));
+        throw ENoConversion(com::Utf8StrFmt("timespec %lld ms is invalid",
+                                            RTTimeSpecGetMilli (&aValue)));
 
     /* Store ISO date (xsd:dateTime). The format is:

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

@@ -21 +21 @@
 #include "Logging.h"
 
-#include <boost/shared_ptr.hpp>
-
+#include <iprt/cdefs.h>
 #include <iprt/err.h>
 #include <iprt/file.h>
@@ -39 +38 @@
 #include <list>
 #include <map>
+#include <boost/shared_ptr.hpp>
 
 #include "VBox/xml.h"