Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed thread-safe versions of wxMB2WC and wxWC2MB

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-18 23:05:15 +00:00
parent 72856fe8cd
commit bae090fcff
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/wxchar.cpp
View File

@@ -50,40 +50,56 @@
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n) size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
{ {
// assume that we have mbsrtowcs() too if we have wcsrtombs()
#if HAVE_WCSRTOMBS
mbstate_t mbstate;
memset(&mbstate, 0, sizeof(mbstate_t));
#endif
if (buf) { if (buf) {
if (!n || !*psz) { if (!n || !*psz) {
if (n) *buf = wxT('\0'); if (n) *buf = wxT('\0');
return 0; return 0;
} }
#ifdef HAVE_WCSRTOMBS
return mbsrtowcs(buf, &psz, n, &mbstate);
#else
return mbstowcs(buf, psz, n); return mbstowcs(buf, psz, n);
#endif
} }
// assume that we have mbsrtowcs() too if we have wcsrtombs()
#ifdef HAVE_WCSRTOMBS #ifdef HAVE_WCSRTOMBS
mbstate_t mbstate;
return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate); return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
#else // !GNU libc #else
return mbstowcs((wchar_t *) NULL, psz, 0); return mbstowcs((wchar_t *) NULL, psz, 0);
#endif // GNU #endif
} }
size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n) size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
{ {
#if HAVE_WCSRTOMBS
mbstate_t mbstate;
memset(&mbstate, 0, sizeof(mbstate_t));
#endif
if (buf) { if (buf) {
if (!n || !*pwz) { if (!n || !*pwz) {
// glibc2.1 chokes on null input // glibc2.1 chokes on null input
if (n) *buf = '\0'; if (n) *buf = '\0';
return 0; return 0;
} }
#if HAVE_WCSRTOMBS
return wcsrtombs(buf, &pwz, n, &mbstate);
#else
return wcstombs(buf, pwz, n); return wcstombs(buf, pwz, n);
#endif
} }
#if HAVE_WCSRTOMBS #if HAVE_WCSRTOMBS
mbstate_t mbstate;
return wcsrtombs((char *) NULL, &pwz, 0, &mbstate); return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
#else // !GNU libc #else
return wcstombs((char *) NULL, pwz, 0); return wcstombs((char *) NULL, pwz, 0);
#endif // GNU #endif
} }
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T