generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-28 19:52:00 +01:00
Code Issues Projects Releases Wiki Activity

Don't pass flags to xrecv method

Browse Source
This commit is contained in:
Martin Hurton
2012-11-09 17:17:43 +01:00
parent 7865f96e97
commit 66dc4d8b54
20 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/req.cpp
View File

@@ -75,7 +75,7 @@ int zmq::req_t::xsend (msg_t *msg_)
return 0;
}
int zmq::req_t::xrecv (msg_t *msg_, int flags_)
int zmq::req_t::xrecv (msg_t *msg_)
{
// If request wasn't send, we can't wait for reply.
if (!receiving_reply) {
@@ -85,14 +85,14 @@ int zmq::req_t::xrecv (msg_t *msg_, int flags_)
// First part of the reply should be the original request ID.
if (message_begins) {
int rc = dealer_t::xrecv (msg_, flags_);
int rc = dealer_t::xrecv (msg_);
if (rc != 0)
return rc;
// TODO: This should also close the connection with the peer!
if (unlikely (!(msg_->flags () & msg_t::more) || msg_->size () != 0)) {
while (true) {
int rc = dealer_t::xrecv (msg_, flags_);
int rc = dealer_t::xrecv (msg_);
errno_assert (rc == 0);
if (!(msg_->flags () & msg_t::more))
break;
@@ -106,7 +106,7 @@ int zmq::req_t::xrecv (msg_t *msg_, int flags_)
message_begins = false;
}
int rc = dealer_t::xrecv (msg_, flags_);
int rc = dealer_t::xrecv (msg_);
if (rc != 0)
return rc;