Commit 2cbf7993 authored by Martin Hurton's avatar Martin Hurton

fq: remove unused parameter

The recv function accepted flags parameter but this was unused.
parent 648e3199
...@@ -70,7 +70,7 @@ int zmq::dealer_t::xrecv (msg_t *msg_, int flags_) ...@@ -70,7 +70,7 @@ int zmq::dealer_t::xrecv (msg_t *msg_, int flags_)
// DEALER socket doesn't use identities. We can safely drop it and // DEALER socket doesn't use identities. We can safely drop it and
while (true) { while (true) {
int rc = fq.recv (msg_, flags_); int rc = fq.recv (msg_);
if (rc != 0) if (rc != 0)
return rc; return rc;
if (likely (!(msg_->flags () & msg_t::identity))) if (likely (!(msg_->flags () & msg_t::identity)))
......
...@@ -63,12 +63,12 @@ void zmq::fq_t::activated (pipe_t *pipe_) ...@@ -63,12 +63,12 @@ void zmq::fq_t::activated (pipe_t *pipe_)
active++; active++;
} }
int zmq::fq_t::recv (msg_t *msg_, int flags_) int zmq::fq_t::recv (msg_t *msg_)
{ {
return recvpipe (msg_, flags_, NULL); return recvpipe (msg_, NULL);
} }
int zmq::fq_t::recvpipe (msg_t *msg_, int flags_, pipe_t **pipe_) int zmq::fq_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
{ {
// Deallocate old content of the message. // Deallocate old content of the message.
int rc = msg_->close (); int rc = msg_->close ();
......
...@@ -44,8 +44,8 @@ namespace zmq ...@@ -44,8 +44,8 @@ namespace zmq
void activated (pipe_t *pipe_); void activated (pipe_t *pipe_);
void terminated (pipe_t *pipe_); void terminated (pipe_t *pipe_);
int recv (msg_t *msg_, int flags_); int recv (msg_t *msg_);
int recvpipe (msg_t *msg_, int flags_, pipe_t **pipe_); int recvpipe (msg_t *msg_, pipe_t **pipe_);
bool has_in (); bool has_in ();
private: private:
......
...@@ -52,7 +52,7 @@ void zmq::pull_t::xterminated (pipe_t *pipe_) ...@@ -52,7 +52,7 @@ void zmq::pull_t::xterminated (pipe_t *pipe_)
int zmq::pull_t::xrecv (msg_t *msg_, int flags_) int zmq::pull_t::xrecv (msg_t *msg_, int flags_)
{ {
return fq.recv (msg_, flags_); return fq.recv (msg_);
} }
bool zmq::pull_t::xhas_in () bool zmq::pull_t::xhas_in ()
......
...@@ -212,7 +212,7 @@ int zmq::router_t::xrecv (msg_t *msg_, int flags_) ...@@ -212,7 +212,7 @@ int zmq::router_t::xrecv (msg_t *msg_, int flags_)
} }
pipe_t *pipe = NULL; pipe_t *pipe = NULL;
int rc = fq.recvpipe (msg_, flags_, &pipe); int rc = fq.recvpipe (msg_, &pipe);
if (rc != 0) { if (rc != 0) {
errno = EAGAIN; errno = EAGAIN;
return -1; return -1;
...@@ -268,7 +268,7 @@ bool zmq::router_t::xhas_in () ...@@ -268,7 +268,7 @@ bool zmq::router_t::xhas_in ()
// Try to read the next message. // Try to read the next message.
// The message, if read, is kept in the pre-fetch buffer. // The message, if read, is kept in the pre-fetch buffer.
pipe_t *pipe = NULL; pipe_t *pipe = NULL;
int rc = fq.recvpipe (&prefetched_msg, ZMQ_DONTWAIT, &pipe); int rc = fq.recvpipe (&prefetched_msg, &pipe);
if (rc != 0) if (rc != 0)
return false; return false;
......
...@@ -132,7 +132,7 @@ int zmq::xsub_t::xrecv (msg_t *msg_, int flags_) ...@@ -132,7 +132,7 @@ int zmq::xsub_t::xrecv (msg_t *msg_, int flags_)
while (true) { while (true) {
// Get a message using fair queueing algorithm. // Get a message using fair queueing algorithm.
int rc = fq.recv (msg_, flags_); int rc = fq.recv (msg_);
// If there's no message available, return immediately. // If there's no message available, return immediately.
// The same when error occurs. // The same when error occurs.
...@@ -149,7 +149,7 @@ int zmq::xsub_t::xrecv (msg_t *msg_, int flags_) ...@@ -149,7 +149,7 @@ int zmq::xsub_t::xrecv (msg_t *msg_, int flags_)
// Message doesn't match. Pop any remaining parts of the message // Message doesn't match. Pop any remaining parts of the message
// from the pipe. // from the pipe.
while (msg_->flags () & msg_t::more) { while (msg_->flags () & msg_t::more) {
rc = fq.recv (msg_, ZMQ_DONTWAIT); rc = fq.recv (msg_);
zmq_assert (rc == 0); zmq_assert (rc == 0);
} }
} }
...@@ -171,7 +171,7 @@ bool zmq::xsub_t::xhas_in () ...@@ -171,7 +171,7 @@ bool zmq::xsub_t::xhas_in ()
while (true) { while (true) {
// Get a message using fair queueing algorithm. // Get a message using fair queueing algorithm.
int rc = fq.recv (&message, ZMQ_DONTWAIT); int rc = fq.recv (&message);
// If there's no message available, return immediately. // If there's no message available, return immediately.
// The same when error occurs. // The same when error occurs.
...@@ -189,7 +189,7 @@ bool zmq::xsub_t::xhas_in () ...@@ -189,7 +189,7 @@ bool zmq::xsub_t::xhas_in ()
// Message doesn't match. Pop any remaining parts of the message // Message doesn't match. Pop any remaining parts of the message
// from the pipe. // from the pipe.
while (message.flags () & msg_t::more) { while (message.flags () & msg_t::more) {
rc = fq.recv (&message, ZMQ_DONTWAIT); rc = fq.recv (&message);
zmq_assert (rc == 0); zmq_assert (rc == 0);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment