generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 7da31910: Merge "Fix wchar.cpp signed/unsigned comparison build failure."

Browse Source 
* commit '7da319106906ad236a0b4502cbafdd8dff7b8a39':
  Fix wchar.cpp signed/unsigned comparison build failure.
This commit is contained in:
Elliott Hughes 2014-05-01 23:56:03 +00:00 committed by Android Git Automerger
commit ba8c37f187
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/wchar.cpp
View File

@ -72,7 +72,7 @@ size_t mbrtowc(wchar_t* pwc, const char* s, size_t n, mbstate_t*) {
// from the first octet, and a mask that extracts the
// interesting bits of the first octet. We already know
// the character is at least two bytes long.
int length;
size_t length;
int mask;
// We also specify a lower bound for the character code to
@ -108,7 +108,7 @@ size_t mbrtowc(wchar_t* pwc, const char* s, size_t n, mbstate_t*) {
// Decode the octet sequence representing the character in chunks
// of 6 bits, most significant first.
wchar_t wch = static_cast<uint8_t>(*s++) & mask;
int i;
size_t i;
for (i = 1; i < MIN(length, n); i++) {
if ((*s & 0xc0) != 0x80) {
// Malformed input; bad characters in the middle of a character.