Changeset 33621 in vbox

Timestamp:

Oct 29, 2010 4:15:40 PM (14 years ago)

Author:

vboxsync

Message:

Utf8Str: Use printfV in Utf8StrFmt, eliminated Utf8StrFmtVA by replacing it by a Utf8Str(str,va) constructor.

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (7 diffs)
• src/VBox/Main/ApplianceImpl.cpp (modified) (1 diff)
• src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/Main/ProgressImpl.cpp (modified) (1 diff)
• src/VBox/Main/VirtualBoxBase.cpp (modified) (3 diffs)
• src/VBox/Main/glue/string.cpp (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (1 diff)

trunk/include/VBox/com/string.h

@@ -431 +431 @@
     }
 
+    /**
+     * Constructs a new string given the format string and the list of the
+     * arguments for the format string.
+     *
+     * @param   a_pszFormat     Pointer to the format string (UTF-8),
+     *                          @see pg_rt_str_format.
+     * @param   a_va            Argument vector containing the arguments
+     *                          specified by the format string.
+     * @sa      iprt::MiniString::printfV
+     */
+    Utf8Str(const char *a_pszFormat, va_list a_va)
+        : MiniString(a_pszFormat, a_va)
+    {
+    }
+
     Utf8Str& operator=(const MiniString &that)
     {
@@ -544 +559 @@
 
 /**
- *  This class is a printf-like formatter for Utf8Str strings. Its purpose is
- *  to construct Utf8Str objects from a format string and a list of arguments
- *  for the format string.
- *
- *  The usage of this class is like the following:
- *  <code>
- *      Utf8StrFmt string("program name = %s", argv[0]);
- *  </code>
+ * Class with iprt::MiniString::printf as constructor for your convenience.
+ *
+ * Constructing a Utf8Str string object from a format string and a variable
+ * number of arguments can easily be confused with the other Utf8Str
+ * constructures, thus this child class.
+ *
+ * The usage of this class is like the following:
+ * @code
+    Utf8StrFmt strName("program name = %s", argv[0]);
+   @endcode
  */
 class Utf8StrFmt : public Utf8Str
@@ -558 +575 @@
 
     /**
-     *  Constructs a new string given the format string and the list
-     *  of the arguments for the format string.
-     *
-     *  @param format   printf-like format string (in UTF-8 encoding)
-     *  @param ...      list of the arguments for the format string
-     */
-    explicit Utf8StrFmt(const char *format, ...)
-    {
-        va_list args;
-        va_start(args, format);
-        init(format, args);
-        va_end(args);
+     * Constructs a new string given the format string and the list of the
+     * arguments for the format string.
+     *
+     * @param   a_pszFormat     Pointer to the format string (UTF-8),
+     *                          @see pg_rt_str_format.
+     * @param   ...             Ellipsis containing the arguments specified by
+     *                          the format string.
+     */
+    explicit Utf8StrFmt(const char *a_pszFormat, ...)
+    {
+        va_list va;
+        va_start(va, a_pszFormat);
+        printfV(a_pszFormat, va);
+        va_end(va);
     }
 
@@ -576 +595 @@
     { }
 
-    void init(const char *format, va_list args);
-
 private:
-};
-
-/**
- *  This class is a vprintf-like formatter for Utf8Str strings. It is
- *  identical to Utf8StrFmt except that its constructor takes a va_list
- *  argument instead of ellipsis.
- *
- *  Note that a separate class is necessary because va_list is defined as
- *  |char *| on most platforms. For this reason, if we had two overloaded
- *  constructors in Utf8StrFmt (one taking ellipsis and another one taking
- *  va_list) then composing a constructor call using exactly two |char *|
- *  arguments would cause the compiler to use the va_list overload instead of
- *  the ellipsis one which is obviously wrong. The compiler would choose
- *  va_list because ellipsis has the lowest rank when it comes to resolving
- *  overloads, as opposed to va_list which is an exact match for |char *|.
- */
-class Utf8StrFmtVA : public Utf8StrFmt
-{
-public:
-
-    /**
-     *  Constructs a new string given the format string and the list
-     *  of the arguments for the format string.
-     *
-     *  @param format   printf-like format string (in UTF-8 encoding)
-     *  @param args     list of arguments for the format string
-     */
-    Utf8StrFmtVA(const char *format, va_list args) { init(format, args); }
 };
 
@@ -627 +616 @@
         va_list args;
         va_start(args, aFormat);
-        copyFrom(Utf8StrFmtVA(aFormat, args).c_str());
+        copyFrom(Utf8Str(aFormat, args).c_str());
         va_end(args);
     }
@@ -633 +622 @@
 
 /**
- * The BstrFmtVA class is a shortcut to <tt>Bstr(Utf8StrFmtVA(...))</tt>.
+ * The BstrFmtVA class is a shortcut to <tt>Bstr(Utf8Str(format,va))</tt>.
  */
 class BstrFmtVA : public Bstr
@@ -648 +637 @@
     BstrFmtVA(const char *aFormat, va_list aArgs)
     {
-        copyFrom(Utf8StrFmtVA(aFormat, aArgs).c_str());
+        copyFrom(Utf8Str(aFormat, aArgs).c_str());
     }
 };

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -819 +819 @@
     va_list args;
     va_start(args, aWarning);
-    Utf8StrFmtVA str(aWarning, args);
+    Utf8Str str(aWarning, args);
     va_end(args);
     m->llWarnings.push_back(str);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3013 +3013 @@
                                   getStaticClassIID(),
                                   getStaticComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   false /* aWarning */,
                                   true /* aLogIt */);
@@ -7039 +7039 @@
     AssertReturnVoid(that);
 
-    Utf8Str message = Utf8StrFmtVA(pszFormat, va);
+    Utf8Str message(pszFormat, va);
 
     LogRel(("Console: VM runtime error: fatal=%RTbool, errorID=%s message=\"%s\"\n",

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -1161 +1161 @@
                                   va_list va)
 {
-    Utf8Str text = Utf8StrFmtVA(aText, va);
+    Utf8Str text(aText, va);
 
     AutoCaller autoCaller(this);

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -462 +462 @@
                                   this->getClassIID(),
                                   this->getComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   false /* aWarning */,
                                   true /* aLogIt */);
@@ -482 +482 @@
                                   this->getClassIID(),
                                   this->getComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   true /* aWarning */,
                                   true /* aLogIt */);
@@ -502 +502 @@
                                   this->getClassIID(),
                                   this->getComponentName(),
-                                  Utf8StrFmtVA(pcsz, args),
+                                  Utf8Str(pcsz, args),
                                   false /* aWarning */,
                                   false /* aLogIt */);

trunk/src/VBox/Main/glue/string.cpp

@@ -139 +139 @@
 }
 
-void Utf8StrFmt::init(const char *format, va_list args)
-{
-    if (!format || !*format)
-    {
-        m_cch = 0;
-        m_cbAllocated = 0;
-        m_psz = NULL;
-    }
-    else
-    {
-        m_cch = RTStrAPrintfV(&m_psz, format, args);
-        m_cbAllocated = m_cch + 1;
-    }
-}
-
 } /* namespace com */

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

@@ -189 +189 @@
         va_list args;
         va_start(args, pcszFormat);
-        Utf8StrFmtVA strWhat(pcszFormat, args);
+        Utf8Str strWhat(pcszFormat, args);
         va_end(args);