Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41ad47e5 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use 0 instead of NULL for comparison to char16_t" am: 6a79e811 am:... 

Merge "Use 0 instead of NULL for comparison to char16_t" am: 6a79e811 am: dc4af935 am: 19011147

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1949458

Change-Id: I1095a1f57d4a91628f5ea8a2c7bdfb8c503eea19
parents b22a8160 19011147

libutils/Unicode_test.cpp

+2 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ TEST_F(UnicodeTest, UTF8toUTF16Normal) { 
        0xF0, 0x90, 0x80, 0x80, // U+10000, 2 UTF-16 character

    };



    char16_t output[1 + 1 + 1 + 2 + 1]; // Room for NULL

    char16_t output[1 + 1 + 1 + 2 + 1];  // Room for null



    utf8_to_utf16(str, sizeof(str), output, sizeof(output) / sizeof(output[0]));
@@ -114,8 +114,7 @@ TEST_F(UnicodeTest, UTF8toUTF16Normal) { 
            << "should be first half of surrogate U+10000";

    EXPECT_EQ(0xDC00, output[4])

            << "should be second half of surrogate U+10000";

    EXPECT_EQ(NULL, output[5])

            << "should be NULL terminated";

    EXPECT_EQ(0, output[5]) << "should be null terminated";

}



TEST_F(UnicodeTest, strstr16EmptyTarget) {