diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pipe.cpp | 8 | ||||
| -rw-r--r-- | src/socket_base.cpp | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/pipe.cpp b/src/pipe.cpp index 5780635..8785330 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -80,11 +80,8 @@ bool zmq::reader_t::check_read () return false; // Check if there's an item in the pipe. - // If not, deactivate the pipe. - if (!pipe->check_read ()) { - terminate (); + if (!pipe->check_read ()) return false; - } // If the next item in the pipe is message delimiter, // initiate its termination. @@ -198,7 +195,8 @@ bool zmq::writer_t::check_write () if (terminating) return false; - if (pipe_full () && (msg_store == NULL || msg_store->full () || extra_msg_flag)) { + if (pipe_full () && (msg_store == NULL || msg_store->full () || + extra_msg_flag)) { stalled = true; return false; } diff --git a/src/socket_base.cpp b/src/socket_base.cpp index f575c0a..fe06d2f 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -244,7 +244,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_, errno = EINVAL; return -1; } - process_commands(false, false); + process_commands (false, false); *((uint32_t*) optval_) = 0; if (has_out ()) *((uint32_t*) optval_) |= ZMQ_POLLOUT; |