Problem: redundant else after return

Solution: remove else
This commit is contained in:
Simon Giesecke
2019-12-08 15:04:50 +01:00
committed by Simon Giesecke
parent 1d9c6bcf09
commit cb2b377d9f
16 changed files with 49 additions and 53 deletions

View File

@@ -257,9 +257,8 @@ static const char *mcast_url (int ipv6_)
{
if (ipv6_) {
return "udp://[" MCAST_IPV6 "]:5555";
} else {
return "udp://" MCAST_IPV4 ":5555";
}
return "udp://" MCAST_IPV4 ":5555";
}
// OSX uses a different name for this socket option

View File

@@ -335,9 +335,8 @@ static uint64_t host_to_network (uint64_t value_)
htonl (static_cast<uint32_t> (value_ & 0xFFFFFFFFLL));
return (static_cast<uint64_t> (low_part) << 32) | high_part;
} else {
return value_;
}
return value_;
}
template <size_t N> void send_command (fd_t s_, char (&command_)[N])

View File

@@ -73,16 +73,16 @@ void test ()
if (rc == -1) {
TEST_ASSERT_EQUAL_INT (EAGAIN, errno);
break;
} else {
TEST_ASSERT_EQUAL_INT (0, rc);
recv_count++;
if (recv_count == 1) {
const int sub_rcvtimeo = 250;
TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
sub, ZMQ_RCVTIMEO, &sub_rcvtimeo, sizeof (sub_rcvtimeo)));
}
}
TEST_ASSERT_EQUAL_INT (0, rc);
recv_count++;
if (recv_count == 1) {
const int sub_rcvtimeo = 250;
TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
sub, ZMQ_RCVTIMEO, &sub_rcvtimeo, sizeof (sub_rcvtimeo)));
}
} while (true);
TEST_ASSERT_EQUAL_INT (send_count, recv_count);