generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Solution: check return code of make_fdpair() with zmq_assert"

Browse Source
This commit is contained in:
Constantin Rack 2015-09-03 10:56:26 +02:00
parent 13db11c6ae
commit 2159618b56
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/signaler.cpp
View File

@ -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