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

Commit 02a3f958 authored by Colin Cross's avatar Colin Cross
Browse files

Use 0 instead of NULL for comparison to char16_t 

musl libc defines NULL as nullptr, which is explicitly allowed by
C++11.  nullptr_t cannot be implicitly cast to an integral type.
Use 0 instead.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: I0c3b6c94cd69262f574414bf52494333f2f2645a
parent e060580c

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) {