Skip to content
Browse files

Minor code cleanup

  • Loading branch information...
1 parent c179ad1 commit 9013ee0d52bb88a5ea08b78c1d31ea5b1b0cd95d @hurtonm hurtonm committed Nov 13, 2012
Showing with 12 additions and 9 deletions.
  1. +3 −2 src/epoll.cpp
  2. +3 −2 src/kqueue.cpp
  3. +3 −3 src/poll.cpp
  4. +3 −2 src/select.cpp
View
5 src/epoll.cpp
@@ -140,9 +140,10 @@ void zmq::epoll_t::loop ()
// Wait for events.
int n = epoll_wait (epoll_fd, &ev_buf [0], max_io_events,
timeout ? timeout : -1);
- if (n == -1 && errno == EINTR)
+ if (n == -1) {
+ errno_assert (errno == EINTR);
continue;
- errno_assert (n != -1);
+ }
for (int i = 0; i < n; i ++) {
poll_entry_t *pe = ((poll_entry_t*) ev_buf [i].data.ptr);
View
5 src/kqueue.cpp
@@ -163,9 +163,10 @@ void zmq::kqueue_t::loop ()
timespec ts = {timeout / 1000, (timeout % 1000) * 1000000};
int n = kevent (kqueue_fd, NULL, 0, &ev_buf [0], max_io_events,
timeout ? &ts: NULL);
- if (n == -1 && errno == EINTR)
+ if (n == -1) {
+ errno_assert (errno == EINTR);
continue;
- errno_assert (n != -1);
+ }
for (int i = 0; i < n; i ++) {
poll_entry_t *pe = (poll_entry_t*) ev_buf [i].udata;
View
6 src/poll.cpp
@@ -125,10 +125,10 @@ void zmq::poll_t::loop ()
// Wait for events.
int rc = poll (&pollset [0], pollset.size (), timeout ? timeout : -1);
- if (rc == -1 && errno == EINTR)
+ if (rc == -1) {
+ errno_assert (errno == EINTR);
continue;
- errno_assert (rc != -1);
-
+ }
// If there are no events (i.e. it's a timeout) there's no point
// in checking the pollset.
View
5 src/select.cpp
@@ -168,9 +168,10 @@ void zmq::select_t::loop ()
#else
int rc = select (maxfd + 1, &readfds, &writefds, &exceptfds,
timeout ? &tv : NULL);
- if (rc == -1 && errno == EINTR)
+ if (rc == -1) {
+ errno_assert (errno == EINTR);
continue;
- errno_assert (rc != -1);
+ }
#endif
// If there are no events (i.e. it's a timeout) there's no point

0 comments on commit 9013ee0

Please sign in to comment.
Something went wrong with that request. Please try again.