generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-17 03:03:25 +02:00
Code Issues Projects Releases Wiki Activity

Problem: C4800 warnings in unittest_ip_resolver.cpp

Browse Source 
Solution: make proper boolean expression
This commit is contained in:
Simon Giesecke
2018-05-14 18:38:30 +02:00
parent c589f2b603
commit b0c3a42ed2
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
unittests/unittest_ip_resolver.cpp
View File

@@ -64,7 +64,7 @@ class test_ip_resolver_t : public zmq::ip_resolver_t
assert (service_ == NULL); assert (service_ == NULL);
bool ipv6 = (hints_->ai_family == AF_INET6); bool ipv6 = (hints_->ai_family == AF_INET6);
bool no_dns = hints_->ai_flags & AI_NUMERICHOST; bool no_dns = (hints_->ai_flags & AI_NUMERICHOST) != 0;
const char *ip = NULL; const char *ip = NULL;
if (!no_dns) { if (!no_dns) {
@@ -156,9 +156,8 @@ static void test_resolve (zmq::ip_resolver_options_t opts_,
TEST_ASSERT_EQUAL (0, rc); TEST_ASSERT_EQUAL (0, rc);
} }
validate_address (family, &addr, expected_addr_, validate_address (family, &addr, expected_addr_, expected_port_,
expected_port_, expected_zone_, expected_zone_, expected_addr_v4_failover_);
expected_addr_v4_failover_);
} }
// Helper macro to define the v4/v6 function pairs // Helper macro to define the v4/v6 function pairs
@@ -167,7 +166,7 @@ static void test_resolve (zmq::ip_resolver_options_t opts_,
\ \
static void _test##_ipv6 () { _test (true); } static void _test##_ipv6 () { _test (true); }
static void test_bind_any (int ipv6_) static void test_bind_any (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;
@@ -178,7 +177,7 @@ static void test_bind_any (int ipv6_)
} }
MAKE_TEST_V4V6 (test_bind_any) MAKE_TEST_V4V6 (test_bind_any)
static void test_bind_any_port0 (int ipv6_) static void test_bind_any_port0 (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;
@@ -190,7 +189,7 @@ static void test_bind_any_port0 (int ipv6_)
} }
MAKE_TEST_V4V6 (test_bind_any_port0) MAKE_TEST_V4V6 (test_bind_any_port0)
static void test_nobind_any (int ipv6_) static void test_nobind_any (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;
@@ -202,7 +201,7 @@ static void test_nobind_any (int ipv6_)
} }
MAKE_TEST_V4V6 (test_nobind_any) MAKE_TEST_V4V6 (test_nobind_any)
static void test_nobind_any_port (int ipv6_) static void test_nobind_any_port (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;
@@ -214,7 +213,7 @@ static void test_nobind_any_port (int ipv6_)
} }
MAKE_TEST_V4V6 (test_nobind_any_port) MAKE_TEST_V4V6 (test_nobind_any_port)
static void test_nobind_addr_anyport (int ipv6_) static void test_nobind_addr_anyport (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;
@@ -225,7 +224,7 @@ static void test_nobind_addr_anyport (int ipv6_)
} }
MAKE_TEST_V4V6 (test_nobind_addr_anyport) MAKE_TEST_V4V6 (test_nobind_addr_anyport)
static void test_nobind_addr_port0 (int ipv6_) static void test_nobind_addr_port0 (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;
@@ -746,7 +745,7 @@ void test_dns_brackets_port_bad ()
test_resolve (resolver_opts, "[ip.zeromq.org:22]", NULL); test_resolve (resolver_opts, "[ip.zeromq.org:22]", NULL);
} }
void test_dns_deny (int ipv6_) void test_dns_deny (bool ipv6_)
{ {
zmq::ip_resolver_options_t resolver_opts; zmq::ip_resolver_options_t resolver_opts;