diff options
author | Lioncash <mathew1800@gmail.com> | 2018-04-30 00:37:15 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-04-30 00:52:33 +0200 |
commit | 3abba08080c88c49359e91ab2688c23fa066110a (patch) | |
tree | c354d58817e230cc2ba1306e449628ef8dafeb3d /src/common/string_util.cpp | |
parent | Merge pull request #421 from Subv/sh_pred3 (diff) | |
download | yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.gz yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.bz2 yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.lz yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.xz yuzu-3abba08080c88c49359e91ab2688c23fa066110a.tar.zst yuzu-3abba08080c88c49359e91ab2688c23fa066110a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/string_util.cpp | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 96c52e3ba..1d952874d 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -46,76 +46,6 @@ bool AsciiToHex(const char* _szValue, u32& result) { return true; } -bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args) { - int writtenCount; - -#ifdef _MSC_VER - // You would think *printf are simple, right? Iterate on each character, - // if it's a format specifier handle it properly, etc. - // - // Nooooo. Not according to the C standard. - // - // According to the C99 standard (7.19.6.1 "The fprintf function") - // The format shall be a multibyte character sequence - // - // Because some character encodings might have '%' signs in the middle of - // a multibyte sequence (SJIS for example only specifies that the first - // byte of a 2 byte sequence is "high", the second byte can be anything), - // printf functions have to decode the multibyte sequences and try their - // best to not screw up. - // - // Unfortunately, on Windows, the locale for most languages is not UTF-8 - // as we would need. Notably, for zh_TW, Windows chooses EUC-CN as the - // locale, and completely fails when trying to decode UTF-8 as EUC-CN. - // - // On the other hand, the fix is simple: because we use UTF-8, no such - // multibyte handling is required as we can simply assume that no '%' char - // will be present in the middle of a multibyte sequence. - // - // This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l. - static locale_t c_locale = nullptr; - if (!c_locale) - c_locale = _create_locale(LC_ALL, ".1252"); - writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args); -#else - writtenCount = vsnprintf(out, outsize, format, args); -#endif - - if (writtenCount > 0 && writtenCount < outsize) { - out[writtenCount] = '\0'; - return true; - } else { - out[outsize - 1] = '\0'; - return false; - } -} - -std::string StringFromFormat(const char* format, ...) { - va_list args; - char* buf = nullptr; -#ifdef _WIN32 - int required = 0; - - va_start(args, format); - required = _vscprintf(format, args); - buf = new char[required + 1]; - CharArrayFromFormatV(buf, required + 1, format, args); - va_end(args); - - std::string temp = buf; - delete[] buf; -#else - va_start(args, format); - if (vasprintf(&buf, format, args) < 0) - NGLOG_ERROR(Common, "Unable to allocate memory for string"); - va_end(args); - - std::string temp = buf; - free(buf); -#endif - return temp; -} - // For Debugging. Read out an u8 array. std::string ArrayToString(const u8* data, size_t size, int line_len, bool spaces) { std::ostringstream oss; |