diff options
| author | James Hawkins <jhawkins@google.com> | 2016-03-01 11:21:53 -0800 |
|---|---|---|
| committer | James Hawkins <jhawkins@google.com> | 2016-03-01 11:21:53 -0800 |
| commit | b898075f307246743676a16f2204ecde35c65146 (patch) | |
| tree | 4a7f64810df70b63ec9c945b9de9513aed851675 | |
| parent | c625acf21701af0f8a57a443a16240ea6e499774 (diff) | |
| download | core-b898075f307246743676a16f2204ecde35c65146.tar.gz core-b898075f307246743676a16f2204ecde35c65146.tar.bz2 core-b898075f307246743676a16f2204ecde35c65146.zip | |
system/core/lib[c]utils: Fix signedness comparison warnings.
* Store the output of a length variable in size_t.
* Annotate unsigned constant values as such.
Bug: 27384813
Change-Id: I8504c0a8f5840d4d42e5c0df797a4e5d02d13eb9
| -rw-r--r-- | libcutils/tests/PropertiesTest.cpp | 8 | ||||
| -rw-r--r-- | libutils/tests/Vector_test.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libcutils/tests/PropertiesTest.cpp b/libcutils/tests/PropertiesTest.cpp index 22ca7069d..5f2396b0b 100644 --- a/libcutils/tests/PropertiesTest.cpp +++ b/libcutils/tests/PropertiesTest.cpp @@ -106,14 +106,14 @@ TEST_F(PropertiesTest, SetString) { ResetValue(); // Since the value is null, default value will be returned - int len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT); + size_t len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT); EXPECT_EQ(strlen(PROPERTY_TEST_VALUE_DEFAULT), len); EXPECT_STREQ(PROPERTY_TEST_VALUE_DEFAULT, mValue); } // Trivial case => get returns what was set { - int len = SetAndGetProperty("hello_world"); + size_t len = SetAndGetProperty("hello_world"); EXPECT_EQ(strlen("hello_world"), len) << "hello_world key"; EXPECT_STREQ("hello_world", mValue); ResetValue(); @@ -122,7 +122,7 @@ TEST_F(PropertiesTest, SetString) { // Set to empty string => get returns default always { const char* EMPTY_STRING_DEFAULT = "EMPTY_STRING"; - int len = SetAndGetProperty("", EMPTY_STRING_DEFAULT); + size_t len = SetAndGetProperty("", EMPTY_STRING_DEFAULT); EXPECT_EQ(strlen(EMPTY_STRING_DEFAULT), len) << "empty key"; EXPECT_STREQ(EMPTY_STRING_DEFAULT, mValue); ResetValue(); @@ -147,7 +147,7 @@ TEST_F(PropertiesTest, SetString) { // Expect that the value set fails since it's too long EXPECT_GT(0, property_set(PROPERTY_TEST_KEY, oneLongerString.c_str())); - int len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT); + size_t len = property_get(PROPERTY_TEST_KEY, mValue, PROPERTY_TEST_VALUE_DEFAULT); EXPECT_EQ(strlen(VALID_TEST_VALUE), len) << "set should've failed"; EXPECT_STREQ(VALID_TEST_VALUE, mValue); diff --git a/libutils/tests/Vector_test.cpp b/libutils/tests/Vector_test.cpp index d9b32f9e9..24ecf86a0 100644 --- a/libutils/tests/Vector_test.cpp +++ b/libutils/tests/Vector_test.cpp @@ -89,9 +89,9 @@ TEST_F(VectorTest, SetCapacity_ShrinkBelowSize) { vector.add(4); vector.setCapacity(8); - ASSERT_EQ(8, vector.capacity()); + ASSERT_EQ(8U, vector.capacity()); vector.setCapacity(2); - ASSERT_EQ(8, vector.capacity()); + ASSERT_EQ(8U, vector.capacity()); } // NOTE: All of the tests below are useless because of the "TODO" above. |