Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word

This commit is contained in:
Ian Barber 2012-06-03 21:34:41 +01:00
parent f687a2989b
commit b79aaaf473

View File

@ -239,9 +239,8 @@ void zmq::session_base_t::terminated (pipe_t *pipe_)
{ {
// If we get a term signal from our held outpipe // If we get a term signal from our held outpipe
// we can safely ignore it. // we can safely ignore it.
if (pipe_ == outpipe) { if (pipe_ == outpipe)
return; return;
}
// Drop the reference to the deallocated pipe. // Drop the reference to the deallocated pipe.
zmq_assert (pipe == pipe_); zmq_assert (pipe == pipe_);
@ -379,7 +378,7 @@ void zmq::session_base_t::process_term (int linger_)
// are processed in case the linger time is non-zero. // are processed in case the linger time is non-zero.
pipe->terminate (linger_ != 0); pipe->terminate (linger_ != 0);
// If we're storing to a to be connected, we can clear that as well // If we're storing to a pipe to be connected, we can clear that as well
if (outpipe) { if (outpipe) {
outpipe->set_event_sink (this); outpipe->set_event_sink (this);
outpipe->terminate (linger_ != 0); outpipe->terminate (linger_ != 0);