diff options
| author | est31 <MTest31@outlook.com> | 2015-07-07 05:55:07 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-07-08 10:12:44 +0200 |
| commit | b0784ba87168e24b0533fc8718a0157cda5ea405 (patch) | |
| tree | 24ca04bbfe2a13193400493e1bde5e520c589e03 /src/util/string.cpp | |
| parent | e234d8b3786d5adfbdf3d1a2123c3e8d91c21880 (diff) | |
| download | minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.gz minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.tar.bz2 minetest-b0784ba87168e24b0533fc8718a0157cda5ea405.zip | |
Use UTF-8 instead of narrow
Use wide_to_utf8 and utf8_to_wide instead of wide_to_narrow and narrow_to_wide at almost all places.
Only exceptions: test functions for narrow conversion, and chat, which is done in a separate commit.
Diffstat (limited to 'src/util/string.cpp')
| -rw-r--r-- | src/util/string.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/util/string.cpp b/src/util/string.cpp index 187d2a078..60ccc9300 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -168,6 +168,16 @@ std::string wide_to_utf8(const std::wstring &input) #endif // _WIN32 +wchar_t *utf8_to_wide_c(const char *str) +{ + std::wstring ret = utf8_to_wide(std::string(str)).c_str(); + size_t len = ret.length(); + wchar_t *ret_c = new wchar_t[len + 1]; + memset(ret_c, 0, (len + 1) * sizeof(wchar_t)); + memcpy(ret_c, ret.c_str(), len * sizeof(wchar_t)); + return ret_c; +} + // You must free the returned string! // The returned string is allocated using new wchar_t *narrow_to_wide_c(const char *str) |