Merge pull request #562 from hintjens/master

Removed tracing on router option setting

src/router.cpp

@@ -82,8 +82,6 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
                 }
                 return 0;
             }
-            //  DEBUGGING PROBLEM WITH TRAVIS CI
-            printf ("E: invalid option value (int=%d value=%d)\n", is_int, value);
             break;
         
         case ZMQ_ROUTER_MANDATORY:
@@ -91,8 +89,6 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
                 mandatory = value;
                 return 0;
             }
-            //  DEBUGGING PROBLEM WITH TRAVIS CI
-            printf ("E: invalid option value (int=%d value=%d)\n", is_int, value);
             break;
             
         case ZMQ_ROUTER_ANNOUNCE_SELF:
@@ -105,8 +101,6 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
         default:
             break;
     }
-    //  DEBUGGING PROBLEM WITH TRAVIS CI
-    printf ("E: invalid option (option=%d)\n", option_);
     errno = EINVAL;
     return -1;
 }

tests/test_connect_delay.cpp

@@ -92,7 +92,7 @@ int main (void)
     rc = zmq_close (to);
     assert (rc == 0);
 
-    rc = zmq_ctx_term(context);
+    rc = zmq_ctx_term (context);
     assert (rc == 0);
 
     // TEST 2
@@ -157,7 +157,7 @@ int main (void)
     rc = zmq_close (to);
     assert (rc == 0);
     
-    rc = zmq_ctx_term(context);
+    rc = zmq_ctx_term (context);
     assert (rc == 0);
 
     // TEST 3
@@ -232,6 +232,6 @@ int main (void)
     rc = zmq_close (frontend);
     assert (rc == 0);
 
-    rc = zmq_ctx_term(context);
+    rc = zmq_ctx_term (context);
     assert (rc == 0);
 }