diff --git a/src/dealer.cpp b/src/dealer.cpp index 665fa10a..9e1ca77f 100644 --- a/src/dealer.cpp +++ b/src/dealer.cpp @@ -47,6 +47,9 @@ zmq::dealer_t::~dealer_t () void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { + // icanhasall_ is unused + (void) icanhasall_; + zmq_assert (pipe_); fq.attach (pipe_); lb.attach (pipe_); @@ -59,6 +62,9 @@ int zmq::dealer_t::xsend (msg_t *msg_, int flags_) int zmq::dealer_t::xrecv (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // If there is a prefetched message, return it. if (prefetched) { int rc = msg_->move (prefetched_msg); diff --git a/src/dist.cpp b/src/dist.cpp index 8347a6ee..a8cb2ecf 100644 --- a/src/dist.cpp +++ b/src/dist.cpp @@ -128,6 +128,9 @@ int zmq::dist_t::send_to_matching (msg_t *msg_, int flags_) void zmq::dist_t::distribute (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // If there are no matching pipes available, simply drop the message. if (matching == 0) { int rc = msg_->close (); diff --git a/src/err.cpp b/src/err.cpp index 1879d29d..5aecd544 100644 --- a/src/err.cpp +++ b/src/err.cpp @@ -72,6 +72,7 @@ void zmq::zmq_abort(const char *errmsg_) extra_info [0] = (ULONG_PTR) errmsg_; RaiseException (0x40000015, EXCEPTION_NONCONTINUABLE, 1, extra_info); #else + (void)errmsg_; abort (); #endif } diff --git a/src/io_object.cpp b/src/io_object.cpp index 81b9ce5a..79463be2 100644 --- a/src/io_object.cpp +++ b/src/io_object.cpp @@ -102,7 +102,7 @@ void zmq::io_object_t::out_event () zmq_assert (false); } -void zmq::io_object_t::timer_event (int id_) +void zmq::io_object_t::timer_event (int) { zmq_assert (false); } diff --git a/src/io_thread.cpp b/src/io_thread.cpp index b5fe4801..c3a3d957 100644 --- a/src/io_thread.cpp +++ b/src/io_thread.cpp @@ -85,7 +85,7 @@ void zmq::io_thread_t::out_event () zmq_assert (false); } -void zmq::io_thread_t::timer_event (int id_) +void zmq::io_thread_t::timer_event (int) { // No timers here. This function is never called. zmq_assert (false); diff --git a/src/lb.cpp b/src/lb.cpp index d5f2f001..51696ff6 100644 --- a/src/lb.cpp +++ b/src/lb.cpp @@ -73,6 +73,9 @@ void zmq::lb_t::activated (pipe_t *pipe_) int zmq::lb_t::send (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // Drop the message if required. If we are at the end of the message // switch back to non-dropping mode. if (dropping) { diff --git a/src/object.cpp b/src/object.cpp index 80784d7a..57e6ea81 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -316,17 +316,17 @@ void zmq::object_t::process_plug () zmq_assert (false); } -void zmq::object_t::process_own (own_t *object_) +void zmq::object_t::process_own (own_t *) { zmq_assert (false); } -void zmq::object_t::process_attach (i_engine *engine_) +void zmq::object_t::process_attach (i_engine *) { zmq_assert (false); } -void zmq::object_t::process_bind (pipe_t *pipe_) +void zmq::object_t::process_bind (pipe_t *) { zmq_assert (false); } @@ -336,12 +336,12 @@ void zmq::object_t::process_activate_read () zmq_assert (false); } -void zmq::object_t::process_activate_write (uint64_t msgs_read_) +void zmq::object_t::process_activate_write (uint64_t) { zmq_assert (false); } -void zmq::object_t::process_hiccup (void *pipe_) +void zmq::object_t::process_hiccup (void *) { zmq_assert (false); } @@ -356,12 +356,12 @@ void zmq::object_t::process_pipe_term_ack () zmq_assert (false); } -void zmq::object_t::process_term_req (own_t *object_) +void zmq::object_t::process_term_req (own_t *) { zmq_assert (false); } -void zmq::object_t::process_term (int linger_) +void zmq::object_t::process_term (int) { zmq_assert (false); } @@ -371,7 +371,7 @@ void zmq::object_t::process_term_ack () zmq_assert (false); } -void zmq::object_t::process_reap (class socket_base_t *socket_) +void zmq::object_t::process_reap (class socket_base_t *) { zmq_assert (false); } diff --git a/src/pair.cpp b/src/pair.cpp index 3be247ab..a06c21d2 100644 --- a/src/pair.cpp +++ b/src/pair.cpp @@ -38,6 +38,9 @@ zmq::pair_t::~pair_t () void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { + // icanhasall_ is unused + (void)icanhasall_; + zmq_assert (pipe_ != NULL); // ZMQ_PAIR socket can only be connected to a single peer. @@ -54,13 +57,13 @@ void zmq::pair_t::xterminated (pipe_t *pipe_) pipe = NULL; } -void zmq::pair_t::xread_activated (pipe_t *pipe_) +void zmq::pair_t::xread_activated (pipe_t *) { // There's just one pipe. No lists of active and inactive pipes. // There's nothing to do here. } -void zmq::pair_t::xwrite_activated (pipe_t *pipe_) +void zmq::pair_t::xwrite_activated (pipe_t *) { // There's just one pipe. No lists of active and inactive pipes. // There's nothing to do here. @@ -85,6 +88,9 @@ int zmq::pair_t::xsend (msg_t *msg_, int flags_) int zmq::pair_t::xrecv (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // Deallocate old content of the message. int rc = msg_->close (); errno_assert (rc == 0); diff --git a/src/pub.cpp b/src/pub.cpp index d92d0d96..8d664e7d 100644 --- a/src/pub.cpp +++ b/src/pub.cpp @@ -32,7 +32,7 @@ zmq::pub_t::~pub_t () { } -int zmq::pub_t::xrecv (class msg_t *msg_, int flags_) +int zmq::pub_t::xrecv (class msg_t *, int) { // Messages cannot be received from PUB socket. errno = ENOTSUP; diff --git a/src/pull.cpp b/src/pull.cpp index a9653e89..a3773559 100644 --- a/src/pull.cpp +++ b/src/pull.cpp @@ -36,6 +36,9 @@ zmq::pull_t::~pull_t () void zmq::pull_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { + // icanhasall_ is unused + (void)icanhasall_; + zmq_assert (pipe_); fq.attach (pipe_); } @@ -52,6 +55,9 @@ void zmq::pull_t::xterminated (pipe_t *pipe_) int zmq::pull_t::xrecv (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + return fq.recv (msg_); } diff --git a/src/push.cpp b/src/push.cpp index e961f5c3..2414f2c1 100644 --- a/src/push.cpp +++ b/src/push.cpp @@ -36,6 +36,9 @@ zmq::push_t::~push_t () void zmq::push_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { + // icanhasall_ is unused + (void)icanhasall_; + zmq_assert (pipe_); lb.attach (pipe_); } diff --git a/src/reaper.cpp b/src/reaper.cpp index 716f6380..ee2b65e3 100644 --- a/src/reaper.cpp +++ b/src/reaper.cpp @@ -78,7 +78,7 @@ void zmq::reaper_t::out_event () zmq_assert (false); } -void zmq::reaper_t::timer_event (int id_) +void zmq::reaper_t::timer_event (int) { zmq_assert (false); } diff --git a/src/router.cpp b/src/router.cpp index 706a8608..b42bc7e5 100644 --- a/src/router.cpp +++ b/src/router.cpp @@ -61,6 +61,9 @@ zmq::router_t::~router_t () void zmq::router_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { + // icanhasall_ is unused + (void)icanhasall_; + zmq_assert (pipe_); bool identity_ok = identify_peer (pipe_); @@ -128,6 +131,9 @@ void zmq::router_t::xwrite_activated (pipe_t *pipe_) int zmq::router_t::xsend (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // If this is the first part of the message it's the ID of the // peer to send the message to. if (!more_out) { @@ -193,6 +199,9 @@ int zmq::router_t::xsend (msg_t *msg_, int flags_) int zmq::router_t::xrecv (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + if (prefetched) { if (!identity_sent) { int rc = msg_->move (prefetched_id); diff --git a/src/session_base.cpp b/src/session_base.cpp index a9af8783..9f277385 100644 --- a/src/session_base.cpp +++ b/src/session_base.cpp @@ -279,7 +279,7 @@ void zmq::session_base_t::write_activated (pipe_t *pipe_) engine->activate_in (); } -void zmq::session_base_t::hiccuped (pipe_t *pipe_) +void zmq::session_base_t::hiccuped (pipe_t *) { // Hiccups are always sent from session to socket, not the other // way round. diff --git a/src/socket_base.cpp b/src/socket_base.cpp index e0dc61c1..586c58dc 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -874,8 +874,7 @@ void zmq::socket_base_t::process_destroy () destroyed = true; } -int zmq::socket_base_t::xsetsockopt (int option_, const void *optval_, - size_t optvallen_) +int zmq::socket_base_t::xsetsockopt (int, const void *, size_t) { errno = EINVAL; return -1; @@ -886,7 +885,7 @@ bool zmq::socket_base_t::xhas_out () return false; } -int zmq::socket_base_t::xsend (msg_t *msg_, int flags_) +int zmq::socket_base_t::xsend (msg_t *, int) { errno = ENOTSUP; return -1; @@ -897,22 +896,22 @@ bool zmq::socket_base_t::xhas_in () return false; } -int zmq::socket_base_t::xrecv (msg_t *msg_, int flags_) +int zmq::socket_base_t::xrecv (msg_t *, int) { errno = ENOTSUP; return -1; } -void zmq::socket_base_t::xread_activated (pipe_t *pipe_) +void zmq::socket_base_t::xread_activated (pipe_t *) { zmq_assert (false); } -void zmq::socket_base_t::xwrite_activated (pipe_t *pipe_) +void zmq::socket_base_t::xwrite_activated (pipe_t *) { zmq_assert (false); } -void zmq::socket_base_t::xhiccuped (pipe_t *pipe_) +void zmq::socket_base_t::xhiccuped (pipe_t *) { zmq_assert (false); } @@ -932,7 +931,7 @@ void zmq::socket_base_t::out_event () zmq_assert (false); } -void zmq::socket_base_t::timer_event (int id_) +void zmq::socket_base_t::timer_event (int) { zmq_assert (false); } diff --git a/src/sub.cpp b/src/sub.cpp index 7378bdec..60a3faa6 100644 --- a/src/sub.cpp +++ b/src/sub.cpp @@ -67,7 +67,7 @@ int zmq::sub_t::xsetsockopt (int option_, const void *optval_, return rc; } -int zmq::sub_t::xsend (msg_t *msg_, int flags_) +int zmq::sub_t::xsend (msg_t *, int) { // Overload the XSUB's send. errno = ENOTSUP; diff --git a/src/tcp.cpp b/src/tcp.cpp index 17a2cb71..3f2f9840 100644 --- a/src/tcp.cpp +++ b/src/tcp.cpp @@ -63,6 +63,15 @@ void zmq::tune_tcp_socket (fd_t s_) void zmq::tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_) { + // These options are used only under certain #ifdefs below. + (void)keepalive_; + (void)keepalive_cnt_; + (void)keepalive_idle_; + (void)keepalive_intvl_; + + // If none of the #ifdefs apply, then s_ is unused. + (void)s_; + // Tuning TCP keep-alives if platform allows it // All values = -1 means skip and leave it for OS #ifdef ZMQ_HAVE_SO_KEEPALIVE diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp index d29f722d..8a08b464 100644 --- a/src/tcp_address.cpp +++ b/src/tcp_address.cpp @@ -488,7 +488,7 @@ zmq::tcp_address_mask_t::tcp_address_mask_t () : address_mask = -1; } -const int zmq::tcp_address_mask_t::mask () const +int zmq::tcp_address_mask_t::mask () const { return address_mask; } @@ -574,7 +574,7 @@ int zmq::tcp_address_mask_t::to_string (std::string &addr_) return 0; } -const bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, const socklen_t ss_len) const +bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss, const socklen_t ss_len) const { zmq_assert (address_mask != -1 && ss != NULL && ss_len >= (socklen_t) sizeof (struct sockaddr)); diff --git a/src/tcp_address.hpp b/src/tcp_address.hpp index 8c5d8440..93d73d81 100644 --- a/src/tcp_address.hpp +++ b/src/tcp_address.hpp @@ -86,9 +86,9 @@ namespace zmq // The opposite to resolve() int to_string (std::string &addr_); - const int mask () const; + int mask () const; - const bool match_address (const struct sockaddr *ss, const socklen_t ss_len) const; + bool match_address (const struct sockaddr *ss, const socklen_t ss_len) const; private: diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 7af2d373..f35531e2 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -238,7 +238,7 @@ zmq::fd_t zmq::tcp_listener_t::accept () // Accept one connection and deal with different failure modes. zmq_assert (s != retired_fd); - struct sockaddr_storage ss = {0}; + struct sockaddr_storage ss = {}; #ifdef ZMQ_HAVE_HPUX int ss_len = sizeof (ss); #else diff --git a/src/xpub.cpp b/src/xpub.cpp index 1430583a..b13e885e 100644 --- a/src/xpub.cpp +++ b/src/xpub.cpp @@ -131,6 +131,9 @@ bool zmq::xpub_t::xhas_out () int zmq::xpub_t::xrecv (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // If there is at least one if (pending.empty ()) { errno = EAGAIN; diff --git a/src/xsub.cpp b/src/xsub.cpp index 7f222449..d41e31b1 100644 --- a/src/xsub.cpp +++ b/src/xsub.cpp @@ -47,6 +47,9 @@ zmq::xsub_t::~xsub_t () void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { + // icanhasall_ is unused + (void)icanhasall_; + zmq_assert (pipe_); fq.attach (pipe_); dist.attach (pipe_); @@ -116,6 +119,9 @@ bool zmq::xsub_t::xhas_out () int zmq::xsub_t::xrecv (msg_t *msg_, int flags_) { + // flags_ is unused + (void)flags_; + // If there's already a message prepared by a previous call to zmq_poll, // return it straight ahead. if (has_message) { diff --git a/src/zmq.cpp b/src/zmq.cpp index d585760b..55dd4a92 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -602,7 +602,7 @@ int zmq_msg_get (zmq_msg_t *msg_, int option_) } } -int zmq_msg_set (zmq_msg_t *msg_, int option_, int optval_) +int zmq_msg_set (zmq_msg_t *, int, int) { // No options supported at present errno = EINVAL;