From 2159618b56d15b2333dee1ae87bc30dd5b1feff9 Mon Sep 17 00:00:00 2001 From: Constantin Rack Date: Thu, 3 Sep 2015 10:56:26 +0200 Subject: [PATCH] Revert "Solution: check return code of make_fdpair() with zmq_assert" --- src/signaler.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/signaler.cpp b/src/signaler.cpp index 92cfb3dc..a212c655 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -124,11 +124,10 @@ static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000) zmq::signaler_t::signaler_t () { // Create the socketpair for signaling. - int rc = make_fdpair (&r, &w); - zmq_assert (rc == 0); - - unblock_socket (w); - unblock_socket (r); + if (make_fdpair (&r, &w) == 0) { + unblock_socket (w); + unblock_socket (r); + } #ifdef HAVE_FORK pid = getpid (); #endif @@ -322,8 +321,7 @@ void zmq::signaler_t::forked () // Close file descriptors created in the parent and create new pair close (r); close (w); - int rc = make_fdpair (&r, &w); - zmq_assert (rc == 0); + make_fdpair (&r, &w); } #endif