Merge pull request #414 from ianbarber/master

Fix build breaking typos in monitor VA code

doc/zmq_setsockopt.txt

@@ -13,7 +13,7 @@ SYNOPSIS
 *int zmq_setsockopt (void '*socket', int 'option_name', const void '*option_value', size_t 'option_len');*
 
 Caution: All options, with the exception of ZMQ_SUBSCRIBE, ZMQ_UNSUBSCRIBE,
-ZMQ_LINGER and ZMQ_FAIL_UNROUTABLE only take effect for subsequent socket 
+ZMQ_LINGER and ZMQ_ROUTER_BEHAVIOR only take effect for subsequent socket 
 bind/connects.
 
 DESCRIPTION
@@ -372,7 +372,11 @@ ZMQ_ROUTER_BEHAVIOR: Set the ROUTER socket behavior
 Sets the 'ROUTER' socket behavior when an unroutable message is encountered. A value
 of `0` is the default when the message is silently discarded, while a value of `1`
 forces the sending to fail with an 'EAGAIN' error code, effectively enabling sending
-messages in a blocking fashion.
+messages in a blocking fashion. 
+
+Note: Setting this socket option may have unpredictable effects on reactor-type 
+libraries that assume EAGAIN will only be sent in HWM-type situations. 
+
 
 [horizontal]
 Option value type:: int

src/ctx.cpp

@@ -356,7 +356,7 @@ zmq::endpoint_t zmq::ctx_t::find_endpoint (const char *addr_)
 void zmq::ctx_t::monitor_event (zmq::socket_base_t *socket_, int event_, ...)
 {
     va_list args;
-    va_start (event_, args);
+    va_start (args, event_);
     va_monitor_event (socket_, event_, args);
     va_end (args);
 }

src/pipe.cpp

@@ -189,10 +189,6 @@ void zmq::pipe_t::rollback ()
 
 void zmq::pipe_t::flush ()
 {
-    //  If terminate() was already called do nothing.
-    if (state == terminated || state == double_terminated)
-        return;
-
     //  The peer does not exist anymore at this point.
     if (state == terminating)
         return;

src/socket_base.cpp

@@ -1001,11 +1001,11 @@ void zmq::socket_base_t::monitor_event (int event_, ...)
 {
     va_list args;
     va_start (args, event_);
-    va_monitor_event(event, args);
+    va_monitor_event(event_, args);
     va_end (args);
 }
 
-void zmq::socket_base_t::monitor_event (int event_, va_list args)
+void zmq::socket_base_t::va_monitor_event (int event_, va_list args)
 {
     get_ctx ()->va_monitor_event (this, event_, args);
 }

src/tcp_listener.cpp

@@ -223,7 +223,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
         goto error;
 #endif
 
-    socket->monitor_event (ZMQ_EVENT_LISTENING, addr_, s);
+    socket->monitor_event (ZMQ_EVENT_LISTENING, endpoint.c_str(), s);
     return 0;
 
 error: