From 7fa4d423b80715c07c526e60aed276a9e8e60a03 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur@push.am>
Date: Mon, 27 Aug 2012 16:00:40 -0700
Subject: [PATCH 1/4] Fix char_traits<unsigned char> to what looks like correct
 behavior.

char_traits<unsigned char>::to_char_type(x) used to return 0 no matter
what x was, and likewise to_int_type(x) used to return 0 no matter what.
(0 is what you get when you default-construct an integral type, which
is what the old code was doing.) This seemed like buggy behavior to me,
so I've changed it.
---
 src/blob.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/blob.hpp b/src/blob.hpp
index a2edf11f..34b63cc9 100644
--- a/src/blob.hpp
+++ b/src/blob.hpp
@@ -96,10 +96,10 @@ namespace std
 
       static char_type
       to_char_type(const int_type& __c)
-      { return char_type(); }
+      { return char_type(__c); }
 
       static int_type
-      to_int_type(const char_type& __c) { return int_type(); }
+      to_int_type(const char_type& __c) { return int_type(__c); }
 
       static bool
       eq_int_type(const int_type& __c1, const int_type& __c2)

From 3b984d40e984b9cd5bca4663765771c7e9b9d61d Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur@push.am>
Date: Mon, 27 Aug 2012 16:05:51 -0700
Subject: [PATCH 2/4] Silence all "unused parameter" warnings from Clang.

Compiling without warnings is a good goal, because it makes
new warnings (which probably indicate bugs) stand out rather
than getting lost in the spam.

My fixes fall into two categories:

    - Adding (void) casts of unused parameters, where their
      unusedness seems like a TODO (or in some cases a bug?).

    - Removing parameter names altogether, where the function
      is clearly a stub that will never use its parameters.

Should be no change in behavior.
---
 src/dealer.cpp       |  6 ++++++
 src/dist.cpp         |  3 +++
 src/err.cpp          |  1 +
 src/io_object.cpp    |  2 +-
 src/io_thread.cpp    |  2 +-
 src/lb.cpp           |  3 +++
 src/object.cpp       | 16 ++++++++--------
 src/pair.cpp         | 10 ++++++++--
 src/pub.cpp          |  2 +-
 src/pull.cpp         |  6 ++++++
 src/push.cpp         |  3 +++
 src/reaper.cpp       |  2 +-
 src/router.cpp       |  9 +++++++++
 src/session_base.cpp |  2 +-
 src/socket_base.cpp  | 15 +++++++--------
 src/sub.cpp          |  2 +-
 src/tcp.cpp          |  9 +++++++++
 src/tcp_address.cpp  |  4 ++--
 src/tcp_address.hpp  |  4 ++--
 src/tcp_listener.cpp |  2 +-
 src/xpub.cpp         |  3 +++
 src/xsub.cpp         |  6 ++++++
 src/zmq.cpp          |  2 +-
 23 files changed, 84 insertions(+), 30 deletions(-)

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;

From c29aef4dd83375806b008c40728485fa95457050 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur@push.am>
Date: Mon, 27 Aug 2012 16:06:51 -0700
Subject: [PATCH 3/4] Verify the value of the "void *s" passed to the monitor
 function.

This formerly unused parameter actually represents the socket
on which the event was received. As such, we should check that
its value makes sense: it must be either "rep" or "req", and in
the case of some kinds of events, it must be specifically one
or the other.

After this change, "s" is no longer unused.
---
 tests/test_monitor.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/test_monitor.cpp b/tests/test_monitor.cpp
index c40708e5..084b0e04 100644
--- a/tests/test_monitor.cpp
+++ b/tests/test_monitor.cpp
@@ -28,29 +28,38 @@
 
 static int events;
 
-void socket_monitor (void *s, int event_, zmq_event_data_t *data_)
+typedef void *ZmqSocket;
+ZmqSocket rep, req;
+
+void socket_monitor (ZmqSocket s, int event_, zmq_event_data_t *data_)
 {
+    assert(s == rep || s == req);
+
     const char *addr = "tcp://127.0.0.1:5560";
     // Only some of the exceptional events could fire
     switch (event_) {
     // listener specific
     case ZMQ_EVENT_LISTENING:
+        assert (s == rep);
         assert (data_->listening.fd > 0);
         assert (!strcmp (data_->listening.addr, addr));
         events |= ZMQ_EVENT_LISTENING;
         break;
     case ZMQ_EVENT_ACCEPTED:
+        assert (s == rep);
         assert (data_->accepted.fd > 0);
         assert (!strcmp (data_->accepted.addr, addr));
         events |= ZMQ_EVENT_ACCEPTED;
         break;
     // connecter specific
     case ZMQ_EVENT_CONNECTED:
+        assert (s == req);
         assert (data_->connected.fd > 0);
         assert (!strcmp (data_->connected.addr, addr));
         events |= ZMQ_EVENT_CONNECTED;
         break;
     case ZMQ_EVENT_CONNECT_DELAYED:
+        assert (s == req);
         assert (data_->connect_delayed.err != 0);
         assert (!strcmp (data_->connect_delayed.addr, addr));
         events |= ZMQ_EVENT_CONNECT_DELAYED;
@@ -77,7 +86,7 @@ void socket_monitor (void *s, int event_, zmq_event_data_t *data_)
     }
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     int rc;
 
@@ -87,13 +96,13 @@ int main (int argc, char *argv [])
     // set socket monitor
     rc = zmq_ctx_set_monitor (ctx, socket_monitor);
     assert (rc == 0);
-    void *rep = zmq_socket (ctx, ZMQ_REP);
+    rep = zmq_socket (ctx, ZMQ_REP);
     assert (rep);
 
     rc = zmq_bind (rep, "tcp://127.0.0.1:5560");
     assert (rc == 0);
 
-    void *req = zmq_socket (ctx, ZMQ_REQ);
+    req = zmq_socket (ctx, ZMQ_REQ);
     assert (req);
 
     rc = zmq_connect (req, "tcp://127.0.0.1:5560");

From 08f6a9e7e86c78c86b9d2ba927d2b35bbca356f7 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur@push.am>
Date: Mon, 27 Aug 2012 16:10:47 -0700
Subject: [PATCH 4/4] Remove unused argc/argv parameters in tests.

---
 tests/test_connect_delay.cpp   | 6 +++---
 tests/test_connect_resolve.cpp | 2 +-
 tests/test_hwm.cpp             | 2 +-
 tests/test_invalid_rep.cpp     | 2 +-
 tests/test_last_endpoint.cpp   | 2 +-
 tests/test_msg_flags.cpp       | 2 +-
 tests/test_pair_inproc.cpp     | 2 +-
 tests/test_pair_ipc.cpp        | 2 +-
 tests/test_pair_tcp.cpp        | 2 +-
 tests/test_reqrep_device.cpp   | 2 +-
 tests/test_reqrep_inproc.cpp   | 2 +-
 tests/test_reqrep_ipc.cpp      | 2 +-
 tests/test_reqrep_tcp.cpp      | 2 +-
 tests/test_router_behavior.cpp | 2 +-
 tests/test_shutdown_stress.cpp | 2 +-
 tests/test_sub_forward.cpp     | 2 +-
 tests/test_term_endpoint.cpp   | 2 +-
 tests/test_timeo.cpp           | 2 +-
 18 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/test_connect_delay.cpp b/tests/test_connect_delay.cpp
index 67ae04cd..b9f06bf4 100644
--- a/tests/test_connect_delay.cpp
+++ b/tests/test_connect_delay.cpp
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "../include/zmq.h"
 
-static void *server (void *c)
+static void *server (void *)
 {
     void *socket, *context;
     char buffer[16];
@@ -88,7 +88,7 @@ static void *server (void *c)
     pthread_exit(NULL);
 }
 
-static void *worker (void *n)
+static void *worker (void *)
 {
     void *socket, *context;
     int rc, hadone, val;
@@ -131,7 +131,7 @@ static void *worker (void *n)
     pthread_exit(NULL);
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_connect_delay running...\n");
     int val;
diff --git a/tests/test_connect_resolve.cpp b/tests/test_connect_resolve.cpp
index 64c99e18..b2b25b06 100644
--- a/tests/test_connect_resolve.cpp
+++ b/tests/test_connect_resolve.cpp
@@ -25,7 +25,7 @@
 
 #include "../include/zmq.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_connect_resolve running...\n");
 
diff --git a/tests/test_hwm.cpp b/tests/test_hwm.cpp
index d887b312..aa41e841 100644
--- a/tests/test_hwm.cpp
+++ b/tests/test_hwm.cpp
@@ -24,7 +24,7 @@
 
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_hwm running...\n");
 
diff --git a/tests/test_invalid_rep.cpp b/tests/test_invalid_rep.cpp
index 316800d1..e74e705f 100644
--- a/tests/test_invalid_rep.cpp
+++ b/tests/test_invalid_rep.cpp
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_invalid_rep running...\n");
 
diff --git a/tests/test_last_endpoint.cpp b/tests/test_last_endpoint.cpp
index e6accc34..f476a63b 100644
--- a/tests/test_last_endpoint.cpp
+++ b/tests/test_last_endpoint.cpp
@@ -35,7 +35,7 @@ static void do_bind_and_verify (void *s, const char *endpoint)
     assert (rc == 0 && strcmp (test, endpoint) == 0);
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     //  Create the infrastructure
     void *ctx = zmq_init (1);
diff --git a/tests/test_msg_flags.cpp b/tests/test_msg_flags.cpp
index 8f653e2d..34c10019 100644
--- a/tests/test_msg_flags.cpp
+++ b/tests/test_msg_flags.cpp
@@ -24,7 +24,7 @@
 
 #include "../include/zmq.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     //  Create the infrastructure
     void *ctx = zmq_init (0);
diff --git a/tests/test_pair_inproc.cpp b/tests/test_pair_inproc.cpp
index 6705cc56..dbccf33c 100644
--- a/tests/test_pair_inproc.cpp
+++ b/tests/test_pair_inproc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_pair_inproc running...\n");
 
diff --git a/tests/test_pair_ipc.cpp b/tests/test_pair_ipc.cpp
index 96a265ff..b9bad5df 100644
--- a/tests/test_pair_ipc.cpp
+++ b/tests/test_pair_ipc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_pair_ipc running...\n");
 
diff --git a/tests/test_pair_tcp.cpp b/tests/test_pair_tcp.cpp
index 464be5a0..c0ce5c56 100644
--- a/tests/test_pair_tcp.cpp
+++ b/tests/test_pair_tcp.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_pair_tcp running...\n");
 
diff --git a/tests/test_reqrep_device.cpp b/tests/test_reqrep_device.cpp
index e562560d..1e05df4e 100644
--- a/tests/test_reqrep_device.cpp
+++ b/tests/test_reqrep_device.cpp
@@ -25,7 +25,7 @@
 
 #include "../include/zmq.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_device running...\n");
 
diff --git a/tests/test_reqrep_inproc.cpp b/tests/test_reqrep_inproc.cpp
index f710968a..126e860a 100644
--- a/tests/test_reqrep_inproc.cpp
+++ b/tests/test_reqrep_inproc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_inproc running...\n");
 
diff --git a/tests/test_reqrep_ipc.cpp b/tests/test_reqrep_ipc.cpp
index fd9b28df..57dc442c 100644
--- a/tests/test_reqrep_ipc.cpp
+++ b/tests/test_reqrep_ipc.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_ipc running...\n");
 
diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp
index 1e6bbbbd..3cdd0a2d 100644
--- a/tests/test_reqrep_tcp.cpp
+++ b/tests/test_reqrep_tcp.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_reqrep_tcp running...\n");
 
diff --git a/tests/test_router_behavior.cpp b/tests/test_router_behavior.cpp
index c201abeb..9fd90721 100644
--- a/tests/test_router_behavior.cpp
+++ b/tests/test_router_behavior.cpp
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include "testutil.hpp"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_router_behavior running...\n");
 
diff --git a/tests/test_shutdown_stress.cpp b/tests/test_shutdown_stress.cpp
index 811637c1..2d99afcd 100644
--- a/tests/test_shutdown_stress.cpp
+++ b/tests/test_shutdown_stress.cpp
@@ -44,7 +44,7 @@ extern "C"
     }
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     void *ctx;
     void *s1;
diff --git a/tests/test_sub_forward.cpp b/tests/test_sub_forward.cpp
index 36a7f4a2..9e4fd133 100644
--- a/tests/test_sub_forward.cpp
+++ b/tests/test_sub_forward.cpp
@@ -25,7 +25,7 @@
 #include "../include/zmq.h"
 #include "../include/zmq_utils.h"
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_sub_forward running...\n");
 
diff --git a/tests/test_term_endpoint.cpp b/tests/test_term_endpoint.cpp
index 6e501d73..533446a0 100644
--- a/tests/test_term_endpoint.cpp
+++ b/tests/test_term_endpoint.cpp
@@ -6,7 +6,7 @@
 #include "../include/zmq_utils.h"
 
 
-int main (int argc, char *argv [])
+int main (void)
 {
     int rc;
     char buf[32];
diff --git a/tests/test_timeo.cpp b/tests/test_timeo.cpp
index e5ce0ac5..4d58af72 100644
--- a/tests/test_timeo.cpp
+++ b/tests/test_timeo.cpp
@@ -44,7 +44,7 @@ extern "C"
     }
 }
 
-int main (int argc, char *argv [])
+int main (void)
 {
     fprintf (stderr, "test_timeo running...\n");