Changeset 52554 in vbox

Timestamp:

Sep 1, 2014 4:00:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95815

Message:

VBox/Main: #1909: Bug & coding style fixes.

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (2 diffs)
• src/VBox/Main/glue/string.cpp (modified) (1 diff)

trunk/include/VBox/com/string.h

@@ -514 +514 @@
     }
 
-    Utf8Str(CBSTR that, size_t a_cchSize = RTSTR_MAX)
-    {
-        copyFrom(that, a_cchSize);
+    Utf8Str(CBSTR that, size_t a_cwcSize = RTSTR_MAX)
+    {
+        copyFrom(that, a_cwcSize);
     }
 
@@ -718 +718 @@
 protected:
 
-    void copyFrom(CBSTR a_pbstr, size_t a_cchSize = RTSTR_MAX);
+    void copyFrom(CBSTR a_pbstr, size_t a_cwcMax = RTSTR_MAX);
     HRESULT copyFromEx(CBSTR a_pbstr);
     HRESULT copyFromExNComRC(const char *a_pcszSrc, size_t a_offSrc, size_t a_cchSrc);

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

@@ -179 +179 @@
  * @param   a_pbstr         The source string.  The caller guarantees that this
  *                          is valid UTF-16.
- * @param   a_cbSize        The number of characters to be copied. If set to RTSTR_MAX,
+ * @param   a_cwcMax        The number of characters to be copied. If set to RTSTR_MAX,
  *                          the entire string will be copied.
  *
  * @sa      RTCString::copyFromN
  */
-void Utf8Str::copyFrom(CBSTR a_pbstr, size_t a_cchSize)
+void Utf8Str::copyFrom(CBSTR a_pbstr, size_t a_cwcMax)
 {
     if (a_pbstr && *a_pbstr)
     {
         int vrc = RTUtf16ToUtf8Ex((PCRTUTF16)a_pbstr,
-                                  a_cchSize,        // size_t cwcString: translate entire string
+                                  a_cwcMax,        // size_t cwcString: translate entire string
                                   &m_psz,           // char **ppsz: output buffer
                                   0,                // size_t cch: if 0, func allocates buffer in *ppsz