From 697b4160fbd62de4cec123a7affb84361f9db0a8 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Tue, 12 Oct 2021 17:54:29 +0200 Subject: [PATCH] fix: warning readability-braces-around-statements --- fairmq/shmem/Socket.h | 53 ++++++++++++++++++++---------------------- fairmq/zeromq/Socket.h | 49 ++++++++++++++++++-------------------- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/fairmq/shmem/Socket.h b/fairmq/shmem/Socket.h index 86442e06..d917a751 100644 --- a/fairmq/shmem/Socket.h +++ b/fairmq/shmem/Socket.h @@ -471,37 +471,34 @@ class Socket final : public fair::mq::Socket static int GetConstant(const std::string& constant) { - if (constant.empty()) return 0; - if (constant == "sub") return ZMQ_SUB; - if (constant == "pub") return ZMQ_PUB; - if (constant == "xsub") return ZMQ_XSUB; - if (constant == "xpub") return ZMQ_XPUB; - if (constant == "push") return ZMQ_PUSH; - if (constant == "pull") return ZMQ_PULL; - if (constant == "req") return ZMQ_REQ; - if (constant == "rep") return ZMQ_REP; - if (constant == "dealer") return ZMQ_DEALER; - if (constant == "router") return ZMQ_ROUTER; - if (constant == "pair") return ZMQ_PAIR; + if (constant.empty()) { return 0; } + if (constant == "sub") { return ZMQ_SUB; } + if (constant == "pub") { return ZMQ_PUB; } + if (constant == "xsub") { return ZMQ_XSUB; } + if (constant == "xpub") { return ZMQ_XPUB; } + if (constant == "push") { return ZMQ_PUSH; } + if (constant == "pull") { return ZMQ_PULL; } + if (constant == "req") { return ZMQ_REQ; } + if (constant == "rep") { return ZMQ_REP; } + if (constant == "dealer") { return ZMQ_DEALER; } + if (constant == "router") { return ZMQ_ROUTER; } + if (constant == "pair") { return ZMQ_PAIR; } - if (constant == "snd-hwm") return ZMQ_SNDHWM; - if (constant == "rcv-hwm") return ZMQ_RCVHWM; - if (constant == "snd-size") return ZMQ_SNDBUF; - if (constant == "rcv-size") return ZMQ_RCVBUF; - if (constant == "snd-more") return ZMQ_SNDMORE; - if (constant == "rcv-more") return ZMQ_RCVMORE; + if (constant == "snd-hwm") { return ZMQ_SNDHWM; } + if (constant == "rcv-hwm") { return ZMQ_RCVHWM; } + if (constant == "snd-size") { return ZMQ_SNDBUF; } + if (constant == "rcv-size") { return ZMQ_RCVBUF; } + if (constant == "snd-more") { return ZMQ_SNDMORE; } + if (constant == "rcv-more") { return ZMQ_RCVMORE; } - if (constant == "linger") return ZMQ_LINGER; - if (constant == "no-block") return ZMQ_DONTWAIT; - if (constant == "snd-more no-block") return ZMQ_DONTWAIT|ZMQ_SNDMORE; + if (constant == "linger") { return ZMQ_LINGER; } + if (constant == "no-block") { return ZMQ_DONTWAIT; } + if (constant == "snd-more no-block") { return ZMQ_DONTWAIT|ZMQ_SNDMORE; } - if (constant == "fd") return ZMQ_FD; - if (constant == "events") - return ZMQ_EVENTS; - if (constant == "pollin") - return ZMQ_POLLIN; - if (constant == "pollout") - return ZMQ_POLLOUT; + if (constant == "fd") { return ZMQ_FD; } + if (constant == "events") { return ZMQ_EVENTS; } + if (constant == "pollin") { return ZMQ_POLLIN; } + if (constant == "pollout") { return ZMQ_POLLOUT; } throw SocketError(tools::ToString("GetConstant called with an invalid argument: ", constant)); } diff --git a/fairmq/zeromq/Socket.h b/fairmq/zeromq/Socket.h index 5a3d6985..0081e459 100644 --- a/fairmq/zeromq/Socket.h +++ b/fairmq/zeromq/Socket.h @@ -423,35 +423,32 @@ class Socket final : public fair::mq::Socket static int GetConstant(const std::string& constant) { - if (constant.empty()) return 0; - if (constant == "sub") return ZMQ_SUB; - if (constant == "pub") return ZMQ_PUB; - if (constant == "xsub") return ZMQ_XSUB; - if (constant == "xpub") return ZMQ_XPUB; - if (constant == "push") return ZMQ_PUSH; - if (constant == "pull") return ZMQ_PULL; - if (constant == "req") return ZMQ_REQ; - if (constant == "rep") return ZMQ_REP; - if (constant == "dealer") return ZMQ_DEALER; - if (constant == "router") return ZMQ_ROUTER; - if (constant == "pair") return ZMQ_PAIR; + if (constant.empty()) { return 0; } + if (constant == "sub") { return ZMQ_SUB; } + if (constant == "pub") { return ZMQ_PUB; } + if (constant == "xsub") { return ZMQ_XSUB; } + if (constant == "xpub") { return ZMQ_XPUB; } + if (constant == "push") { return ZMQ_PUSH; } + if (constant == "pull") { return ZMQ_PULL; } + if (constant == "req") { return ZMQ_REQ; } + if (constant == "rep") { return ZMQ_REP; } + if (constant == "dealer") { return ZMQ_DEALER; } + if (constant == "router") { return ZMQ_ROUTER; } + if (constant == "pair") { return ZMQ_PAIR; } - if (constant == "snd-hwm") return ZMQ_SNDHWM; - if (constant == "rcv-hwm") return ZMQ_RCVHWM; - if (constant == "snd-size") return ZMQ_SNDBUF; - if (constant == "rcv-size") return ZMQ_RCVBUF; - if (constant == "snd-more") return ZMQ_SNDMORE; - if (constant == "rcv-more") return ZMQ_RCVMORE; + if (constant == "snd-hwm") { return ZMQ_SNDHWM; } + if (constant == "rcv-hwm") { return ZMQ_RCVHWM; } + if (constant == "snd-size") { return ZMQ_SNDBUF; } + if (constant == "rcv-size") { return ZMQ_RCVBUF; } + if (constant == "snd-more") { return ZMQ_SNDMORE; } + if (constant == "rcv-more") { return ZMQ_RCVMORE; } - if (constant == "linger") return ZMQ_LINGER; + if (constant == "linger") { return ZMQ_LINGER; } - if (constant == "fd") return ZMQ_FD; - if (constant == "events") - return ZMQ_EVENTS; - if (constant == "pollin") - return ZMQ_POLLIN; - if (constant == "pollout") - return ZMQ_POLLOUT; + if (constant == "fd") { return ZMQ_FD; } + if (constant == "events") { return ZMQ_EVENTS; } + if (constant == "pollin") { return ZMQ_POLLIN; } + if (constant == "pollout") { return ZMQ_POLLOUT; } throw SocketError(tools::ToString("GetConstant called with an invalid argument: ", constant)); }