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>

server/ResolverController.cpp

diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 6bb6ffc..c96e90e 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -329,7 +329,7 @@
 
     ExternalPrivateDnsStatus privateDnsStatus = {PrivateDnsMode::OFF, 0, {}};
     resolv_get_private_dns_status_for_net(netId, &privateDnsStatus);
-    for (int i = 0; i < privateDnsStatus.numServers; i++) {
+    for (unsigned i = 0; i < privateDnsStatus.numServers; i++) {
         std::string tlsServer_str = addrToString(&(privateDnsStatus.serverStatus[i].ss));
         tlsServers->push_back(std::move(tlsServer_str));
     }
@@ -405,7 +405,7 @@
         } else {
             dw.println("Private DNS configuration (%u entries)", privateDnsStatus.numServers);
             dw.incIndent();
-            for (int i = 0; i < privateDnsStatus.numServers; i++) {
+            for (unsigned i = 0; i < privateDnsStatus.numServers; i++) {
                 dw.println("%s name{%s} status{%s}",
                            addrToString(&(privateDnsStatus.serverStatus[i].ss)).c_str(),
                            privateDnsStatus.serverStatus[i].hostname,

server/XfrmControllerTest.cpp

diff --git a/server/XfrmControllerTest.cpp b/server/XfrmControllerTest.cpp
index 5f74e32..1613905 100644
--- a/server/XfrmControllerTest.cpp
+++ b/server/XfrmControllerTest.cpp
@@ -300,18 +300,18 @@
     EXPECT_EQ(DROID_SPI, static_cast<int>(userspi.max));
 }
 
-void verifyXfrmiArguments(int mark, int mask, int ifId) {
+void verifyXfrmiArguments(uint32_t mark, uint32_t mask, uint32_t ifId) {
     // Check that correct arguments (and only those) are non-zero, and correct.
-    EXPECT_EQ(0, mark);
-    EXPECT_EQ(0, mask);
+    EXPECT_EQ(0U, mark);
+    EXPECT_EQ(0U, mask);
     EXPECT_EQ(TEST_XFRM_IF_ID, ifId);
 }
 
-void verifyVtiArguments(int mark, int mask, int ifId) {
+void verifyVtiArguments(uint32_t mark, uint32_t mask, uint32_t ifId) {
     // Check that correct arguments (and only those) are non-zero, and correct.
     EXPECT_EQ(TEST_XFRM_MARK, mark);
     EXPECT_EQ(TEST_XFRM_MASK, mask);
-    EXPECT_EQ(0, ifId);
+    EXPECT_EQ(0U, ifId);
 }
 
 void testIpSecAddSecurityAssociation(testCaseParams params, const MockSyscalls& mockSyscalls,
@@ -446,10 +446,10 @@
         EXPECT_TRUE(fwmark.explicitlySelected);
         EXPECT_TRUE(fwmark.protectedFromVpn);
     } else {
-        EXPECT_EQ(0, outputmark.outputMark);
-        EXPECT_EQ(0, mark.mark.v);
-        EXPECT_EQ(0, mark.mark.m);
-        EXPECT_EQ(0, xfrm_if_id.if_id);
+        EXPECT_EQ(0U, outputmark.outputMark);
+        EXPECT_EQ(0U, mark.mark.v);
+        EXPECT_EQ(0U, mark.mark.m);
+        EXPECT_EQ(0U, xfrm_if_id.if_id);
     }
 }