Commit 9c748f1b authored by Sergey Kachanovskiy's avatar Sergey Kachanovskiy Committed by Simon Giesecke

Partial fix for issue 2963, removed invalid casts from fd_t to int (#2984)

* Fixes issue 2963, ref stream_engine.cpp:981

* Fixes issue 2963, ref socks_connecter.cpp:158

* Fixes issue 2963, ref tcp_listener.cpp:144

* Fixes issue 2963, ref tcp_connecter.cpp:423

* Fixes issue 2963, ref socks_connecter.cpp:436

* Fixes issue 2963, ref tcp_listener.cpp:179

* Fixes issue 2963, ref tcp_listener.cpp:268

* Fixes issue 2963, ref tcp_connecter.cpp:160
parent 7bce4ffb
...@@ -158,7 +158,7 @@ void zmq::socks_connecter_t::in_event () ...@@ -158,7 +158,7 @@ void zmq::socks_connecter_t::in_event ()
// Attach the engine to the corresponding session object. // Attach the engine to the corresponding session object.
send_attach (session, engine); send_attach (session, engine);
socket->event_connected (endpoint, (int) s); socket->event_connected (endpoint, s);
rm_fd (handle); rm_fd (handle);
s = -1; s = -1;
...@@ -444,7 +444,7 @@ void zmq::socks_connecter_t::close () ...@@ -444,7 +444,7 @@ void zmq::socks_connecter_t::close ()
const int rc = ::close (s); const int rc = ::close (s);
errno_assert (rc == 0); errno_assert (rc == 0);
#endif #endif
socket->event_closed (endpoint, (int) s); socket->event_closed (endpoint, s);
s = retired_fd; s = retired_fd;
} }
......
...@@ -978,7 +978,7 @@ void zmq::stream_engine_t::error (error_reason_t reason) ...@@ -978,7 +978,7 @@ void zmq::stream_engine_t::error (error_reason_t reason)
socket->event_handshake_failed_no_detail (endpoint, err); socket->event_handshake_failed_no_detail (endpoint, err);
} }
#endif #endif
socket->event_disconnected (endpoint, (int) s); socket->event_disconnected (endpoint, s);
session->flush (); session->flush ();
session->engine_error (reason); session->engine_error (reason);
unplug (); unplug ();
......
...@@ -160,7 +160,7 @@ void zmq::tcp_connecter_t::out_event () ...@@ -160,7 +160,7 @@ void zmq::tcp_connecter_t::out_event ()
// Shut the connecter down. // Shut the connecter down.
terminate (); terminate ();
socket->event_connected (endpoint, (int) fd); socket->event_connected (endpoint, fd);
} }
void zmq::tcp_connecter_t::rm_handle () void zmq::tcp_connecter_t::rm_handle ()
...@@ -435,6 +435,6 @@ void zmq::tcp_connecter_t::close () ...@@ -435,6 +435,6 @@ void zmq::tcp_connecter_t::close ()
const int rc = ::close (s); const int rc = ::close (s);
errno_assert (rc == 0); errno_assert (rc == 0);
#endif #endif
socket->event_closed (endpoint, (int) s); socket->event_closed (endpoint, s);
s = retired_fd; s = retired_fd;
} }
...@@ -144,7 +144,7 @@ void zmq::tcp_listener_t::close () ...@@ -144,7 +144,7 @@ void zmq::tcp_listener_t::close ()
int rc = ::close (s); int rc = ::close (s);
errno_assert (rc == 0); errno_assert (rc == 0);
#endif #endif
socket->event_closed (endpoint, (int) s); socket->event_closed (endpoint, s);
s = retired_fd; s = retired_fd;
} }
...@@ -179,7 +179,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_) ...@@ -179,7 +179,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
if (options.use_fd != -1) { if (options.use_fd != -1) {
s = options.use_fd; s = options.use_fd;
socket->event_listening (endpoint, (int) s); socket->event_listening (endpoint, s);
return 0; return 0;
} }
...@@ -275,7 +275,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_) ...@@ -275,7 +275,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
goto error; goto error;
#endif #endif
socket->event_listening (endpoint, (int) s); socket->event_listening (endpoint, s);
return 0; return 0;
error: error:
......
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