actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't mess up UTF-8 strings

Browse Source
This commit is contained in:
Glenn Maynard
2003-02-11 07:09:55 +00:00
parent 864ae8060f
commit f6679c4afc
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StdString.h
+12 -6
View File
@@ -415,8 +415,13 @@ inline SS_NOTHROW int sslen(const std::string& s)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// sstolower/sstoupper -- convert characters to upper/lower case // sstolower/sstoupper -- convert characters to upper/lower case
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
inline char sstoupper(char ch) { return (char)::toupper(ch); } //inline char sstoupper(char ch) { return (char)::toupper(ch); }
inline char sstolower(char ch) { return (char)::tolower(ch); } //inline char sstolower(char ch) { return (char)::tolower(ch); }
/* Our strings are UTF-8; instead of having to play around with locales,
* let's just manually toupper ASCII only. If we really want to play with
* Unicode cases, we can do it ourself in RageUtil. */
inline char sstoupper(char ch) { return (ch >= 'a' && ch <= 'z')? char(ch + 'A' - 'a'): ch; }
inline char sstolower(char ch) { return (ch >= 'A' && ch <= 'Z')? char(ch + 'a' - 'A'): ch; }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// ssasn: assignment functions -- assign "sSrc" to "sDst" // ssasn: assignment functions -- assign "sSrc" to "sDst"
@@ -542,7 +547,7 @@ inline void ssadd(std::string& sDst, PCSTR pA)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// ssupr/sslwr: Uppercase/Lowercase conversion functions // ssupr/sslwr: Uppercase/Lowercase conversion functions
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#ifdef SS_ANSI // #ifdef SS_ANSI
template<typename CT> template<typename CT>
inline void sslwr(CT* pT, size_t nLen) inline void sslwr(CT* pT, size_t nLen)
{ {
@@ -555,7 +560,8 @@ inline void ssadd(std::string& sDst, PCSTR pA)
for ( CT* p = pT; static_cast<size_t>(p - pT) < nLen; ++p) for ( CT* p = pT; static_cast<size_t>(p - pT) < nLen; ++p)
*p = (CT)sstoupper(*p); *p = (CT)sstoupper(*p);
} }
#else // #else we must be on Win32 #if 0
// #else // #else we must be on Win32
#ifdef _MBCS #ifdef _MBCS
inline void ssupr(PSTR pA, size_t /*nLen*/) inline void ssupr(PSTR pA, size_t /*nLen*/)
{ {
@@ -575,8 +581,8 @@ inline void ssadd(std::string& sDst, PCSTR pA)
_strlwr(pA); _strlwr(pA);
} }
#endif #endif
#endif // #ifdef SS_ANSI // #endif // #ifdef SS_ANSI
#endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// vsprintf/vswprintf or _vsnprintf/_vsnwprintf equivalents. In standard // vsprintf/vswprintf or _vsnprintf/_vsnwprintf equivalents. In standard
// builds we can't use _vsnprintf/_vsnwsprintf because they're MS extensions. // builds we can't use _vsnprintf/_vsnwsprintf because they're MS extensions.