From 7a510b4b60a2dc0f0cac9b74a74a4ae44f8c53c1 Mon Sep 17 00:00:00 2001 From: Richard Newton Date: Thu, 7 Nov 2013 17:50:29 +0000 Subject: [PATCH] Fix formatting. --- src/ctx.cpp | 8 ++++---- src/devpoll.cpp | 2 +- src/devpoll.hpp | 2 +- src/epoll.cpp | 2 +- src/epoll.hpp | 2 +- src/kqueue.cpp | 2 +- src/kqueue.hpp | 2 +- src/poll.cpp | 2 +- src/poll.hpp | 2 +- src/select.cpp | 2 +- src/select.hpp | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ctx.cpp b/src/ctx.cpp index 071c5722..6d934cdc 100644 --- a/src/ctx.cpp +++ b/src/ctx.cpp @@ -40,8 +40,8 @@ int clipped_maxsocket(int max_requested) { - if (max_requested >= zmq::poller_t::max_fds() && zmq::poller_t::max_fds() != -1) - max_requested = zmq::poller_t::max_fds() - 1; // -1 because we need room for the repear mailbox. + if (max_requested >= zmq::poller_t::max_fds () && zmq::poller_t::max_fds () != -1) + max_requested = zmq::poller_t::max_fds () - 1; // -1 because we need room for the repear mailbox. return max_requested; } @@ -53,7 +53,7 @@ zmq::ctx_t::ctx_t () : reaper (NULL), slot_count (0), slots (NULL), - max_sockets(clipped_maxsocket(ZMQ_MAX_SOCKETS_DFLT)), + max_sockets (clipped_maxsocket (ZMQ_MAX_SOCKETS_DFLT)), io_thread_count (ZMQ_IO_THREADS_DFLT), ipv6 (false) { @@ -169,7 +169,7 @@ int zmq::ctx_t::shutdown () int zmq::ctx_t::set (int option_, int optval_) { int rc = 0; - if (option_ == ZMQ_MAX_SOCKETS && optval_ >= 1 && optval_ == clipped_maxsocket(optval_)) { + if (option_ == ZMQ_MAX_SOCKETS && optval_ >= 1 && optval_ == clipped_maxsocket (optval_)) { opt_sync.lock (); max_sockets = optval_; opt_sync.unlock (); diff --git a/src/devpoll.cpp b/src/devpoll.cpp index 841e42ab..02b4a9c6 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.cpp @@ -133,7 +133,7 @@ void zmq::devpoll_t::stop () stopping = true; } -int zmq::devpoll_t::max_fds() +int zmq::devpoll_t::max_fds () { return -1; } diff --git a/src/devpoll.hpp b/src/devpoll.hpp index 12ed9afd..fbf93287 100644 --- a/src/devpoll.hpp +++ b/src/devpoll.hpp @@ -56,7 +56,7 @@ namespace zmq void start (); void stop (); - static int max_fds(); + static int max_fds (); private: diff --git a/src/epoll.cpp b/src/epoll.cpp index 92163ef4..492e06cd 100644 --- a/src/epoll.cpp +++ b/src/epoll.cpp @@ -126,7 +126,7 @@ void zmq::epoll_t::stop () stopping = true; } -int zmq::epoll_t::max_fds() +int zmq::epoll_t::max_fds () { return -1; } diff --git a/src/epoll.hpp b/src/epoll.hpp index c32f7eb9..0c89cb5b 100644 --- a/src/epoll.hpp +++ b/src/epoll.hpp @@ -58,7 +58,7 @@ namespace zmq void start (); void stop (); - static int max_fds(); + static int max_fds (); private: diff --git a/src/kqueue.cpp b/src/kqueue.cpp index e834f3d4..8ecf8137 100644 --- a/src/kqueue.cpp +++ b/src/kqueue.cpp @@ -152,7 +152,7 @@ void zmq::kqueue_t::stop () stopping = true; } -int zmq::kqueue_t::max_fds() +int zmq::kqueue_t::max_fds () { return -1; } diff --git a/src/kqueue.hpp b/src/kqueue.hpp index 50599958..20d256cc 100644 --- a/src/kqueue.hpp +++ b/src/kqueue.hpp @@ -58,7 +58,7 @@ namespace zmq void start (); void stop (); - static int max_fds(); + static int max_fds (); private: diff --git a/src/poll.cpp b/src/poll.cpp index fff088e7..cf23afc0 100644 --- a/src/poll.cpp +++ b/src/poll.cpp @@ -114,7 +114,7 @@ void zmq::poll_t::stop () stopping = true; } -int zmq::poll_t::max_fds() +int zmq::poll_t::max_fds () { return -1; } diff --git a/src/poll.hpp b/src/poll.hpp index 0a34ec4b..a3311688 100644 --- a/src/poll.hpp +++ b/src/poll.hpp @@ -59,7 +59,7 @@ namespace zmq void start (); void stop (); - static int max_fds(); + static int max_fds (); private: diff --git a/src/select.cpp b/src/select.cpp index 755d443e..b5cb972c 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -144,7 +144,7 @@ void zmq::select_t::stop () stopping = true; } -int zmq::select_t::max_fds() +int zmq::select_t::max_fds () { return FD_SETSIZE; } diff --git a/src/select.hpp b/src/select.hpp index 26ff2550..9c3ef472 100644 --- a/src/select.hpp +++ b/src/select.hpp @@ -69,7 +69,7 @@ namespace zmq void start (); void stop (); - static int max_fds(); + static int max_fds (); private: