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

am 77338a29: Merge "Address additional warnings found by GCC 4.9."

Browse Source 
* commit '77338a2969c4b5d6de5200c326ef67d6a82e95b2':
  Address additional warnings found by GCC 4.9.
This commit is contained in:
Ben Cheng 2014-05-19 22:30:09 +00:00 committed by Android Git Automerger
commit d979838321
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/wchar_test.cpp
View File

@ -306,19 +306,19 @@ void test_mbrtowc_incomplete(mbstate_t* ps) {
// 2-byte UTF-8. // 2-byte UTF-8.
ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xc2", 1, ps)); ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xc2", 1, ps));
ASSERT_EQ(1U, mbrtowc(&out, "\xa2" "cdef", 5, ps)); ASSERT_EQ(1U, mbrtowc(&out, "\xa2" "cdef", 5, ps));
ASSERT_EQ(0x00a2, out); ASSERT_EQ(static_cast<wchar_t>(0x00a2), out);
ASSERT_TRUE(mbsinit(ps)); ASSERT_TRUE(mbsinit(ps));
// 3-byte UTF-8. // 3-byte UTF-8.
ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xe2", 1, ps)); ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xe2", 1, ps));
ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\x82", 1, ps)); ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\x82", 1, ps));
ASSERT_EQ(1U, mbrtowc(&out, "\xac" "def", 4, ps)); ASSERT_EQ(1U, mbrtowc(&out, "\xac" "def", 4, ps));
ASSERT_EQ(0x20ac, out); ASSERT_EQ(static_cast<wchar_t>(0x20ac), out);
ASSERT_TRUE(mbsinit(ps)); ASSERT_TRUE(mbsinit(ps));
// 4-byte UTF-8. // 4-byte UTF-8.
ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xf0", 1, ps)); ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xf0", 1, ps));
ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xa4\xad", 2, ps)); ASSERT_EQ(static_cast<size_t>(-2), mbrtowc(&out, "\xa4\xad", 2, ps));
ASSERT_EQ(1U, mbrtowc(&out, "\xa2" "ef", 3, ps)); ASSERT_EQ(1U, mbrtowc(&out, "\xa2" "ef", 3, ps));
ASSERT_EQ(0x24b62, out); ASSERT_EQ(static_cast<wchar_t>(0x24b62), out);
ASSERT_TRUE(mbsinit(ps)); ASSERT_TRUE(mbsinit(ps));
// Invalid 2-byte // Invalid 2-byte
@ -341,9 +341,9 @@ void test_mbsrtowcs(mbstate_t* ps) {
const char* valid = "A" "\xc2\xa2" "\xe2\x82\xac" "\xf0\xa4\xad\xa2" "ef"; const char* valid = "A" "\xc2\xa2" "\xe2\x82\xac" "\xf0\xa4\xad\xa2" "ef";
ASSERT_EQ(4U, mbsrtowcs(out, &valid, 4, ps)); ASSERT_EQ(4U, mbsrtowcs(out, &valid, 4, ps));
ASSERT_EQ(L'A', out[0]); ASSERT_EQ(L'A', out[0]);
ASSERT_EQ(0x00a2, out[1]); ASSERT_EQ(static_cast<wchar_t>(0x00a2), out[1]);
ASSERT_EQ(0x20ac, out[2]); ASSERT_EQ(static_cast<wchar_t>(0x20ac), out[2]);
ASSERT_EQ(0x24b62, out[3]); ASSERT_EQ(static_cast<wchar_t>(0x24b62), out[3]);
ASSERT_EQ('e', *valid); ASSERT_EQ('e', *valid);
const char* invalid = "A" "\xc2\x20" "ef"; const char* invalid = "A" "\xc2\x20" "ef";