Changeset 67334 in vbox for trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp

Timestamp:

Jun 12, 2017 9:48:11 AM (8 years ago)

Author:

vboxsync

Message:

IPRT: Added RTStrToUtf16BigEx and RTStrToUtf16Big for turning UTF-8 into UTF-16BE (big endian).

File:

• trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp

@@ -688 +688 @@
 
 /**
- * RTStrToUtf16Ex returning big-endian UTF-16.
- */
-static int rtFsIso9660_StrToUtf16BigEndian(const char *pszString, size_t cchString, PRTUTF16 *ppwsz, size_t cwc, size_t *pcwc)
-{
-    int rc = RTStrToUtf16Ex(pszString, cchString, ppwsz, cwc, pcwc);
-#ifndef RT_BIG_ENDIAN
-    if (RT_SUCCESS(rc))
-    {
-        PRTUTF16 pwc = *ppwsz;
-        RTUTF16  wc;
-        while ((wc = *pwc))
-            *pwc++ = RT_H2BE_U16(wc);
-    }
-#endif
-    return rc;
-}
-
-
-/**
  * Looks up the shared structure for a child.
  *
@@ -774 +755 @@
     {
         PRTUTF16 pwszEntry = uBuf.wszEntry;
-        rc = rtFsIso9660_StrToUtf16BigEndian(pszEntry, RTSTR_MAX, &pwszEntry, RT_ELEMENTS(uBuf.wszEntry), &cwcEntry);
+        rc = RTStrToUtf16BigEx(pszEntry, RTSTR_MAX, &pwszEntry, RT_ELEMENTS(uBuf.wszEntry), &cwcEntry);
         if (RT_FAILURE(rc))
             return rc;