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

take a char* for utf8_to_wchar

Browse Source
This commit is contained in:
Glenn Maynard
2006-03-01 00:14:50 +00:00
parent 3a1d3883b5
commit 18fbd2e8a4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+4 -4
View File
@@ -1227,14 +1227,14 @@ bool utf8_to_wchar_ec( const RString &s, unsigned &start, wchar_t &ch )
}
/* Like utf8_to_wchar_ec, but only does enough error checking to prevent crashing. */
bool utf8_to_wchar( const RString &s, unsigned &start, wchar_t &ch )
bool utf8_to_wchar( const char *s, size_t iLength, unsigned &start, wchar_t &ch )
{
if( start >= s.size() )
if( start >= iLength )
return false;
int len = utf8_get_char_len( s[start] );
if( start+len > s.size() )
if( start+len > iLength )
{
/* We don't have room for enough continuation bytes. Return error. */
start += len;
@@ -1377,7 +1377,7 @@ wstring RStringToWstring( const RString &s )
}
wchar_t ch;
if( !utf8_to_wchar( s, start, ch ) )
if( !utf8_to_wchar( s.data(), s.size(), start, ch ) )
ch = INVALID_CHAR;
ret += ch;
}
stepmania/src/RageUtil.h
+1 -1
View File
@@ -280,7 +280,7 @@ typedef int longchar;
extern const wchar_t INVALID_CHAR;
int utf8_get_char_len( char p );
bool utf8_to_wchar( const RString &s, unsigned &start, wchar_t &ch );
bool utf8_to_wchar( const char *s, size_t iLength, unsigned &start, wchar_t &ch );
bool utf8_to_wchar_ec( const RString &s, unsigned &start, wchar_t &ch );
void wchar_to_utf8( wchar_t ch, RString &out );
wchar_t utf8_get_char( const RString &s );