Commit 23c55612 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1563 from zeromq/revert-1561-issue-1558

Revert "Solution: check return code of make_fdpair() with zmq_assert"
parents 13db11c6 2159618b
...@@ -124,11 +124,10 @@ static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000) ...@@ -124,11 +124,10 @@ static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000)
zmq::signaler_t::signaler_t () zmq::signaler_t::signaler_t ()
{ {
// Create the socketpair for signaling. // Create the socketpair for signaling.
int rc = make_fdpair (&r, &w); if (make_fdpair (&r, &w) == 0) {
zmq_assert (rc == 0); unblock_socket (w);
unblock_socket (r);
unblock_socket (w); }
unblock_socket (r);
#ifdef HAVE_FORK #ifdef HAVE_FORK
pid = getpid (); pid = getpid ();
#endif #endif
...@@ -322,8 +321,7 @@ void zmq::signaler_t::forked () ...@@ -322,8 +321,7 @@ void zmq::signaler_t::forked ()
// Close file descriptors created in the parent and create new pair // Close file descriptors created in the parent and create new pair
close (r); close (r);
close (w); close (w);
int rc = make_fdpair (&r, &w); make_fdpair (&r, &w);
zmq_assert (rc == 0);
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment