Merge pull request #298 from pieterh/master

Fixed issue (unknown) on zmq_init(-1)

Merge pull request #298 from pieterh/master
Fixed issue (unknown) on zmq_init(-1)
3eaae8b2 · Ian Barber · cecc790c · eb8217bb · 3eaae8b2
Commit 3eaae8b2 authored Mar 29, 2012 by Ian Barber
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

zmq.cpp src/zmq.cpp +7 -3

No files found.
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -210,9 +210,13 @@ int zmq_ctx_get (void *ctx_, int option_)
 void *zmq_init (int io_threads_)
 {
-    void *ctx = zmq_ctx_new ();
+    if (io_threads_ >= 0) {
-    zmq_ctx_set (ctx, ZMQ_IO_THREADS, io_threads_);
+        void *ctx = zmq_ctx_new ();
-    return ctx;
+        zmq_ctx_set (ctx, ZMQ_IO_THREADS, io_threads_);
+        return ctx;
+    }
+    errno = EINVAL;
+    return NULL;   
 }
 int zmq_term (void *ctx_)