generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-31 14:39:55 +01:00
Code Issues Projects Releases Wiki Activity

Minor cleanups

Browse Source
This commit is contained in:
Martin Hurton 2013-06-06 11:00:41 +02:00
parent c3e40736de
commit 4e47084dd4
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pipe.cpp
View File

@ -340,7 +340,7 @@ void zmq::pipe_t::terminate (bool delay_)
// There are still pending messages available, but the user calls
// 'terminate'. We can act as if all the pending messages were read.
else
if (state == waiting_for_delimiter && delay == 0) {
if (state == waiting_for_delimiter && !delay) {
outpipe = NULL;
send_pipe_term_ack (peer);
state = term_ack_sent;

5
src/plain_mechanism.cpp
View File

@ -110,7 +110,6 @@ int zmq::plain_mechanism_t::process_handshake_message (msg_t *msg_)
return 0;
}
bool zmq::plain_mechanism_t::is_handshake_complete () const
{
return state == ready;
@ -163,7 +162,7 @@ int zmq::plain_mechanism_t::process_hello_command (msg_t *msg_)
errno = EPROTO;
return -1;
}
size_t username_length = static_cast <size_t> (*ptr++);
const size_t username_length = static_cast <size_t> (*ptr++);
bytes_left -= 1;
if (bytes_left < username_length) {
@ -178,7 +177,7 @@ int zmq::plain_mechanism_t::process_hello_command (msg_t *msg_)
errno = EPROTO;
return -1;
}
size_t password_length = static_cast <size_t> (*ptr++);
const size_t password_length = static_cast <size_t> (*ptr++);
bytes_left -= 1;
if (bytes_left < password_length) {

8
src/session_base.cpp
View File

@ -217,9 +217,9 @@ void zmq::session_base_t::pipe_terminated (pipe_t *pipe_)
terminate ();
}
// If we are waiting for pending messages to be sent, at this point
// we are sure that there will be no more messages and we can proceed
// with termination safely.
// If we are waiting for pending messages to be sent, at this point
// we are sure that there will be no more messages and we can proceed
// with termination safely.
if (pending && !pipe && terminating_pipes.empty ())
proceed_with_term ();
}
@ -349,7 +349,7 @@ void zmq::session_base_t::process_term (int linger_)
void zmq::session_base_t::proceed_with_term ()
{
// The pending phase have just ended.
// The pending phase has just ended.
pending = false;
// Continue with standard termination.

2
src/session_base.hpp
View File

@ -110,7 +110,7 @@ namespace zmq
zmq::pipe_t *pipe;
// This set is added to with pipes we are disconnecting, but haven't yet completed
std::set<pipe_t *> terminating_pipes;
std::set <pipe_t *> terminating_pipes;
// This flag is true if the remainder of the message being processed
// is still in the in pipe.