commit 8659b8d2d53f35a1c6ad0287363ce565b46f732d
author Sehee Park <sehee32.park@samsung.com> Fri Nov 16 10:53:16 2018 +0900
committer Sehee Park <sehee32.park@samsung.com> Thu Dec 06 23:59:45 2018 +0000
tree 408d703601ac1b7863302467fb98597a59f0d84e
parent be1323ab2443edd331573e2b9c33a1f5abd6160b

Add type cast to fix build error with "-Wsign-compare" cflag.

There is build error if "-Wsign-compare" is defined in cflags.
Also add "-Wsign-compare" to Android.bp

Test: Build

Change-Id: If41da96ec521a0d2dcddf660e7effa218c99810d
Signed-off-by: Sehee Park <sehee32.park@samsung.com>

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index 801226d..77aae5d 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -295,7 +295,7 @@
              0xFFFE},
     };
 
-    for (unsigned int i = 0; i < std::size(kTestData); i++) {
+    for (size_t i = 0; i < std::size(kTestData); i++) {
         const auto& td = kTestData[i];
 
         binder::Status status;
@@ -306,7 +306,7 @@
         EXPECT_TRUE(status.isOk()) << td.family << status.exceptionMessage();
 
         // Check that the interface exists
-        EXPECT_NE(0, if_nametoindex(td.deviceName.c_str()));
+        EXPECT_NE(0U, if_nametoindex(td.deviceName.c_str()));
 
         // Update Tunnel Interface.
         status = mNetd->ipSecUpdateTunnelInterface(td.deviceName, td.localAddress, td.remoteAddress,
@@ -318,7 +318,7 @@
         EXPECT_TRUE(status.isOk()) << td.family << status.exceptionMessage();
 
         // Check that the interface no longer exists
-        EXPECT_EQ(0, if_nametoindex(td.deviceName.c_str()));
+        EXPECT_EQ(0U, if_nametoindex(td.deviceName.c_str()));
     }
 }
 
@@ -832,7 +832,7 @@
         { "foo:bar::bad", 64, false },
     };
 
-    for (unsigned int i = 0; i < std::size(kTestData); i++) {
+    for (size_t i = 0; i < std::size(kTestData); i++) {
         const auto &td = kTestData[i];
 
         // [1.a] Add the address.
@@ -885,7 +885,7 @@
             {INetd::IPV6, INetd::NEIGH, LOOPBACK, "ucast_solicit", "3", 0},
     };
 
-    for (int i = 0; i < std::size(kTestData); i++) {
+    for (size_t i = 0; i < std::size(kTestData); i++) {
         const auto& td = kTestData[i];
 
         std::string value;
@@ -893,12 +893,12 @@
                 mNetd->getProcSysNet(td.ipversion, td.which, td.ifname, td.parameter, &value);
 
         if (td.expectedReturnCode == 0) {
-            SCOPED_TRACE(String8::format("test case %d should have passed", i));
+            SCOPED_TRACE(String8::format("test case %zu should have passed", i));
             EXPECT_EQ(0, status.exceptionCode());
             EXPECT_EQ(0, status.serviceSpecificErrorCode());
             EXPECT_EQ(td.expectedValue, value);
         } else {
-            SCOPED_TRACE(String8::format("test case %d should have failed", i));
+            SCOPED_TRACE(String8::format("test case %zu should have failed", i));
             EXPECT_EQ(binder::Status::EX_SERVICE_SPECIFIC, status.exceptionCode());
             EXPECT_EQ(td.expectedReturnCode, status.serviceSpecificErrorCode());
         }
@@ -923,18 +923,18 @@
             {INetd::IPV6, INetd::NEIGH, sTun.name().c_str(), "ucast_solicit", "7", 0},
     };
 
-    for (int i = 0; i < std::size(kTestData); i++) {
+    for (size_t i = 0; i < std::size(kTestData); i++) {
         const auto& td = kTestData[i];
 
         const binder::Status status =
                 mNetd->setProcSysNet(td.ipversion, td.which, td.ifname, td.parameter, td.value);
 
         if (td.expectedReturnCode == 0) {
-            SCOPED_TRACE(String8::format("test case %d should have passed", i));
+            SCOPED_TRACE(String8::format("test case %zu should have passed", i));
             EXPECT_EQ(0, status.exceptionCode());
             EXPECT_EQ(0, status.serviceSpecificErrorCode());
         } else {
-            SCOPED_TRACE(String8::format("test case %d should have failed", i));
+            SCOPED_TRACE(String8::format("test case %zu should have failed", i));
             EXPECT_EQ(binder::Status::EX_SERVICE_SPECIFIC, status.exceptionCode());
             EXPECT_EQ(td.expectedReturnCode, status.serviceSpecificErrorCode());
         }
@@ -1001,7 +1001,7 @@
         { {"192.0.2.14"}, "", { fp, short_fp }, EINVAL },
     };
 
-    for (unsigned int i = 0; i < std::size(kTlsTestData); i++) {
+    for (size_t i = 0; i < std::size(kTlsTestData); i++) {
         const auto &td = kTlsTestData[i];
 
         std::vector<std::string> fingerprints;
@@ -1013,11 +1013,11 @@
                 td.tlsName, td.servers, fingerprints);
 
         if (td.expectedReturnCode == 0) {
-            SCOPED_TRACE(String8::format("test case %d should have passed", i));
+            SCOPED_TRACE(String8::format("test case %zu should have passed", i));
             SCOPED_TRACE(status.toString8());
             EXPECT_EQ(0, status.exceptionCode());
         } else {
-            SCOPED_TRACE(String8::format("test case %d should have failed", i));
+            SCOPED_TRACE(String8::format("test case %zu should have failed", i));
             EXPECT_EQ(binder::Status::EX_SERVICE_SPECIFIC, status.exceptionCode());
             EXPECT_EQ(td.expectedReturnCode, status.serviceSpecificErrorCode());
         }
@@ -1737,7 +1737,7 @@
     EXPECT_TRUE(mNetd->networkAddInterface(TEST_NETID1, sTun.name()).isOk());
 
     // Setup route for testing nextHop
-    for (unsigned int i = 0; i < std::size(kTestDataWithNextHop); i++) {
+    for (size_t i = 0; i < std::size(kTestDataWithNextHop); i++) {
         const auto& td = kTestDataWithNextHop[i];
 
         // All route for test tun will disappear once the tun interface is deleted.
@@ -1766,7 +1766,7 @@
                                  testTableLegacyNetwork);
     }
 
-    for (unsigned int i = 0; i < std::size(kTestData); i++) {
+    for (size_t i = 0; i < std::size(kTestData); i++) {
         const auto& td = kTestData[i];
 
         binder::Status status =