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>
diff --git a/resolv/res_cache.cpp b/resolv/res_cache.cpp
index 4f02bfc..8ae4be0 100644
--- a/resolv/res_cache.cpp
+++ b/resolv/res_cache.cpp
@@ -1776,7 +1776,7 @@
.ai_family = AF_UNSPEC, .ai_socktype = SOCK_DGRAM, .ai_flags = AI_NUMERICHOST};
int rt = getaddrinfo_numeric(servers[i], sbuf, hints, &nsaddrinfo[i]);
if (rt != 0) {
- for (int j = 0; j < i; j++) {
+ for (unsigned j = 0; j < i; j++) {
freeaddrinfo(nsaddrinfo[j]);
}
VLOG << __func__ << ": getaddrinfo_numeric(" << servers[i]
@@ -1830,7 +1830,7 @@
res_cache_clear_stats_locked(cache_info);
++cache_info->revision_id;
}
- for (int j = 0; j < numservers; j++) {
+ for (unsigned j = 0; j < numservers; j++) {
freeaddrinfo(nsaddrinfo[j]);
}
}
diff --git a/resolv/resolver_test.cpp b/resolv/resolver_test.cpp
index 19aa562..ba224cc 100644
--- a/resolv/resolver_test.cpp
+++ b/resolv/resolver_test.cpp
@@ -330,9 +330,9 @@
// lookups for ip6-localhost, with and without search domains appended.
dns.clearQueries();
result = gethostbyname(name_ip6);
- EXPECT_EQ(2, dns.queries().size()) << dns.dumpQueries();
- EXPECT_EQ(1, GetNumQueriesForType(dns, ns_type::ns_t_a, name_ip6_dot)) << dns.dumpQueries();
- EXPECT_EQ(1, GetNumQueriesForType(dns, ns_type::ns_t_a, name_ip6_fqdn)) << dns.dumpQueries();
+ EXPECT_EQ(2U, dns.queries().size()) << dns.dumpQueries();
+ EXPECT_EQ(1U, GetNumQueriesForType(dns, ns_type::ns_t_a, name_ip6_dot)) << dns.dumpQueries();
+ EXPECT_EQ(1U, GetNumQueriesForType(dns, ns_type::ns_t_a, name_ip6_fqdn)) << dns.dumpQueries();
ASSERT_TRUE(result == nullptr);
// Finally, use gethostbyname2() to resolve ip6-localhost to ::1 from
@@ -362,7 +362,7 @@
constexpr char numeric_v4[] = "192.168.0.1";
dns.clearQueries();
const hostent* result = gethostbyname(numeric_v4);
- EXPECT_EQ(0, dns.queries().size());
+ EXPECT_EQ(0U, dns.queries().size());
ASSERT_FALSE(result == nullptr);
ASSERT_EQ(4, result->h_length); // v4
ASSERT_FALSE(result->h_addr_list[0] == nullptr);
@@ -373,13 +373,13 @@
constexpr char numeric_v6[] = "2001:db8::42";
dns.clearQueries();
result = gethostbyname(numeric_v6);
- EXPECT_EQ(0, dns.queries().size());
+ EXPECT_EQ(0U, dns.queries().size());
EXPECT_TRUE(result == nullptr);
// Numeric v6 address with gethostbyname2(): succeeds with no DNS queries
dns.clearQueries();
result = gethostbyname2(numeric_v6, AF_INET6);
- EXPECT_EQ(0, dns.queries().size());
+ EXPECT_EQ(0U, dns.queries().size());
ASSERT_FALSE(result == nullptr);
ASSERT_EQ(16, result->h_length); // v6
ASSERT_FALSE(result->h_addr_list[0] == nullptr);
@@ -394,7 +394,7 @@
constexpr char numeric_v6_scope[] = "fe80::1%lo";
dns.clearQueries();
result = gethostbyname2(numeric_v6_scope, AF_INET6);
- EXPECT_EQ(2, dns.queries().size()); // OUCH!
+ EXPECT_EQ(2U, dns.queries().size()); // OUCH!
ASSERT_TRUE(result == nullptr);
dns.stopServer();
@@ -454,7 +454,7 @@
EXPECT_EQ(servers.size(), res_servers.size());
EXPECT_EQ(domains.size(), res_domains.size());
EXPECT_EQ(0U, res_tls_servers.size());
- ASSERT_EQ(INetd::RESOLVER_PARAMS_COUNT, mDefaultParams_Binder.size());
+ ASSERT_EQ(static_cast<size_t>(INetd::RESOLVER_PARAMS_COUNT), mDefaultParams_Binder.size());
EXPECT_EQ(mDefaultParams_Binder[INetd::RESOLVER_PARAMS_SAMPLE_VALIDITY],
res_params.sample_validity);
EXPECT_EQ(mDefaultParams_Binder[INetd::RESOLVER_PARAMS_SUCCESS_THRESHOLD],
@@ -818,7 +818,7 @@
EXPECT_EQ(0U, res_servers.size());
EXPECT_EQ(0U, res_domains.size());
EXPECT_EQ(0U, res_tls_servers.size());
- ASSERT_EQ(INetd::RESOLVER_PARAMS_COUNT, mDefaultParams_Binder.size());
+ ASSERT_EQ(static_cast<size_t>(INetd::RESOLVER_PARAMS_COUNT), mDefaultParams_Binder.size());
EXPECT_EQ(mDefaultParams_Binder[INetd::RESOLVER_PARAMS_SAMPLE_VALIDITY],
res_params.sample_validity);
EXPECT_EQ(mDefaultParams_Binder[INetd::RESOLVER_PARAMS_SUCCESS_THRESHOLD],