Changeset 7426 in vbox for trunk

Timestamp:

Mar 12, 2008 9:46:29 AM (17 years ago)

Author:

vboxsync

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

28861

Message:

RTUCS2 -> RTUTF16.

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/utf8-posix.cpp (modified) (4 diffs)
• win/fileio-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/posix/utf8-posix.cpp

@@ -74 +74 @@
     {
         cbOutput2 = cbInput * cFactor;
-        pvOutput = RTMemTmpAlloc(cbOutput2 + sizeof(RTUCS2));
+        pvOutput = RTMemTmpAlloc(cbOutput2 + sizeof(RTUTF16));
         if (!pvOutput)
             return VERR_NO_TMP_MEMORY;
@@ -81 +81 @@
     {
         pvOutput = *ppvOutput;
-        cbOutput2 = cbOutput - (!strcmp(pszOutputCS, "UCS-2") ? sizeof(RTUCS2) : 1);
+        cbOutput2 = cbOutput - (!strcmp(pszOutputCS, "UCS-2") ? sizeof(RTUTF16) : 1);
         if (cbOutput2 > cbOutput)
             return VERR_BUFFER_OVERFLOW;
@@ -101 +101 @@
             pszOutputCS = nl_langinfo(CODESET);
 #endif
-        iconv_t icHandle = iconv_open(pszOutputCS, pszInputCS);        
+        iconv_t icHandle = iconv_open(pszOutputCS, pszInputCS);
         if (icHandle != (iconv_t)-1)
         {
@@ -125 +125 @@
                     iconv_close(icHandle);
                     if (!cbOutput || !strcmp(pszOutputCS, "UCS-2"))
-                        *(PRTUCS2)pvOutputLeft = '\0';
+                        *(PRTUTF16)pvOutputLeft = '\0';
                     else
                         *(char *)pvOutputLeft = '\0';

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -229 +229 @@
                               NULL);
 #else
-    PRTUCS2 pwszFilename;
+    PRTUTF16 pwszFilename;
     rc = RTStrToUtf16(pszFilename, &pwszFilename);
     if (RT_FAILURE(rc))