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

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

Browse Source 
* 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
This commit is contained in:
Sergey Kachanovskiy 2018-03-12 11:55:58 +01:00 committed by Simon Giesecke
parent 7bce4ffbc7
commit 9c748f1bf1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/socks_connecter.cpp
View File

@ -158,7 +158,7 @@ void zmq::socks_connecter_t::in_event ()
// Attach the engine to the corresponding session object.
send_attach (session, engine);
socket->event_connected (endpoint, (int) s);
socket->event_connected (endpoint, s);
rm_fd (handle);
s = -1;
@ -444,7 +444,7 @@ void zmq::socks_connecter_t::close ()
const int rc = ::close (s);
errno_assert (rc == 0);
#endif
socket->event_closed (endpoint, (int) s);
socket->event_closed (endpoint, s);
s = retired_fd;
}

2
src/stream_engine.cpp
View File

@ -978,7 +978,7 @@ void zmq::stream_engine_t::error (error_reason_t reason)
socket->event_handshake_failed_no_detail (endpoint, err);
}
#endif
socket->event_disconnected (endpoint, (int) s);
socket->event_disconnected (endpoint, s);
session->flush ();
session->engine_error (reason);
unplug ();

4
src/tcp_connecter.cpp
View File

@ -160,7 +160,7 @@ void zmq::tcp_connecter_t::out_event ()
// Shut the connecter down.
terminate ();
socket->event_connected (endpoint, (int) fd);
socket->event_connected (endpoint, fd);
}
void zmq::tcp_connecter_t::rm_handle ()
@ -435,6 +435,6 @@ void zmq::tcp_connecter_t::close ()
const int rc = ::close (s);
errno_assert (rc == 0);
#endif
socket->event_closed (endpoint, (int) s);
socket->event_closed (endpoint, s);
s = retired_fd;
}

6
src/tcp_listener.cpp
View File

@ -144,7 +144,7 @@ void zmq::tcp_listener_t::close ()
int rc = ::close (s);
errno_assert (rc == 0);
#endif
socket->event_closed (endpoint, (int) s);
socket->event_closed (endpoint, s);
s = retired_fd;
}
@ -179,7 +179,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
if (options.use_fd != -1) {
s = options.use_fd;
socket->event_listening (endpoint, (int) s);
socket->event_listening (endpoint, s);
return 0;
}
@ -275,7 +275,7 @@ int zmq::tcp_listener_t::set_address (const char *addr_)
goto error;
#endif
socket->event_listening (endpoint, (int) s);
socket->event_listening (endpoint, s);
return 0;
error: