From d767909b50e2ab83557fb95dce967470297e7937 Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Sun, 27 May 2018 06:48:49 -0400 Subject: [PATCH] Problem: old C-style casts used Solution: replace by static_cast/reinterpret_cast --- src/epoll.cpp | 19 ++++++++++--------- src/ipc_address.cpp | 6 +++--- src/ipc_connecter.cpp | 3 ++- src/ipc_listener.cpp | 7 ++++--- src/random.cpp | 2 +- src/socket_poller.cpp | 2 +- src/tcp.cpp | 7 ++++--- src/tcp_listener.cpp | 5 +++-- src/udp_engine.cpp | 5 +++-- src/zmq.cpp | 2 +- 10 files changed, 32 insertions(+), 26 deletions(-) diff --git a/src/epoll.cpp b/src/epoll.cpp index cf19a452..91173c51 100644 --- a/src/epoll.cpp +++ b/src/epoll.cpp @@ -108,7 +108,7 @@ zmq::epoll_t::handle_t zmq::epoll_t::add_fd (fd_t fd_, i_poll_events *events_) void zmq::epoll_t::rm_fd (handle_t handle_) { check_thread (); - poll_entry_t *pe = (poll_entry_t *) handle_; + poll_entry_t *pe = static_cast (handle_); int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_DEL, pe->fd, &pe->ev); errno_assert (rc != -1); pe->fd = retired_fd; @@ -123,7 +123,7 @@ void zmq::epoll_t::rm_fd (handle_t handle_) void zmq::epoll_t::set_pollin (handle_t handle_) { check_thread (); - poll_entry_t *pe = (poll_entry_t *) handle_; + poll_entry_t *pe = static_cast (handle_); pe->ev.events |= EPOLLIN; int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev); errno_assert (rc != -1); @@ -132,8 +132,8 @@ void zmq::epoll_t::set_pollin (handle_t handle_) void zmq::epoll_t::reset_pollin (handle_t handle_) { check_thread (); - poll_entry_t *pe = (poll_entry_t *) handle_; - pe->ev.events &= ~((short) EPOLLIN); + poll_entry_t *pe = static_cast (handle_); + pe->ev.events &= ~(static_cast (EPOLLIN)); int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev); errno_assert (rc != -1); } @@ -141,7 +141,7 @@ void zmq::epoll_t::reset_pollin (handle_t handle_) void zmq::epoll_t::set_pollout (handle_t handle_) { check_thread (); - poll_entry_t *pe = (poll_entry_t *) handle_; + poll_entry_t *pe = static_cast (handle_); pe->ev.events |= EPOLLOUT; int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev); errno_assert (rc != -1); @@ -150,8 +150,8 @@ void zmq::epoll_t::set_pollout (handle_t handle_) void zmq::epoll_t::reset_pollout (handle_t handle_) { check_thread (); - poll_entry_t *pe = (poll_entry_t *) handle_; - pe->ev.events &= ~((short) EPOLLOUT); + poll_entry_t *pe = static_cast (handle_); + pe->ev.events &= ~(static_cast (EPOLLOUT)); int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev); errno_assert (rc != -1); } @@ -172,7 +172,7 @@ void zmq::epoll_t::loop () while (true) { // Execute any due timers. - int timeout = (int) execute_timers (); + int timeout = static_cast (execute_timers ()); if (get_load () == 0) { if (timeout == 0) @@ -191,7 +191,8 @@ void zmq::epoll_t::loop () } for (int i = 0; i < n; i++) { - poll_entry_t *pe = ((poll_entry_t *) ev_buf[i].data.ptr); + poll_entry_t *pe = + (static_cast (ev_buf[i].data.ptr)); if (pe->fd == retired_fd) continue; diff --git a/src/ipc_address.cpp b/src/ipc_address.cpp index 0f4cb829..4791d65d 100644 --- a/src/ipc_address.cpp +++ b/src/ipc_address.cpp @@ -100,9 +100,9 @@ const sockaddr *zmq::ipc_address_t::addr () const socklen_t zmq::ipc_address_t::addrlen () const { if (!address.sun_path[0] && address.sun_path[1]) - return (socklen_t) strlen (address.sun_path + 1) + sizeof (sa_family_t) - + 1; - return (socklen_t) sizeof address; + return static_cast (strlen (address.sun_path + 1)) + + sizeof (sa_family_t) + 1; + return static_cast (sizeof address); } #endif diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp index eaebfe9f..7109caa2 100644 --- a/src/ipc_connecter.cpp +++ b/src/ipc_connecter.cpp @@ -252,7 +252,8 @@ zmq::fd_t zmq::ipc_connecter_t::connect () #else socklen_t len = sizeof (err); #endif - int rc = getsockopt (s, SOL_SOCKET, SO_ERROR, (char *) &err, &len); + int rc = getsockopt (s, SOL_SOCKET, SO_ERROR, + reinterpret_cast (&err), &len); if (rc == -1) { if (errno == ENOPROTOOPT) errno = 0; diff --git a/src/ipc_listener.cpp b/src/ipc_listener.cpp index 04f5462f..2ebc1074 100644 --- a/src/ipc_listener.cpp +++ b/src/ipc_listener.cpp @@ -201,13 +201,13 @@ int zmq::ipc_listener_t::get_address (std::string &addr_) #else socklen_t sl = sizeof (ss); #endif - int rc = getsockname (s, (sockaddr *) &ss, &sl); + int rc = getsockname (s, reinterpret_cast (&ss), &sl); if (rc != 0) { addr_.clear (); return rc; } - ipc_address_t addr ((struct sockaddr *) &ss, sl); + ipc_address_t addr (reinterpret_cast (&ss), sl); return addr.to_string (addr_); } @@ -266,7 +266,8 @@ int zmq::ipc_listener_t::set_address (const char *addr_) } // Bind the socket to the file path. - rc = bind (s, (sockaddr *) address.addr (), address.addrlen ()); + rc = bind (s, const_cast (address.addr ()), + address.addrlen ()); if (rc != 0) goto error; diff --git a/src/random.cpp b/src/random.cpp index c66c6d08..5cdc010f 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -51,7 +51,7 @@ void zmq::seed_random () #if defined ZMQ_HAVE_WINDOWS int pid = static_cast (GetCurrentProcessId ()); #else - int pid = (int) getpid (); + int pid = static_cast (getpid ()); #endif srand (static_cast (clock_t::now_us () + pid)); } diff --git a/src/socket_poller.cpp b/src/socket_poller.cpp index 9eb41c7c..ba7ea9eb 100644 --- a/src/socket_poller.cpp +++ b/src/socket_poller.cpp @@ -296,7 +296,7 @@ void zmq::socket_poller_t::rebuild () if (_pollset_size == 0) return; - _pollfds = (pollfd *) malloc (_pollset_size * sizeof (pollfd)); + _pollfds = static_cast (malloc (_pollset_size * sizeof (pollfd))); alloc_assert (_pollfds); int item_nbr = 0; diff --git a/src/tcp.cpp b/src/tcp.cpp index a816f0b8..8b89b6a1 100644 --- a/src/tcp.cpp +++ b/src/tcp.cpp @@ -128,8 +128,9 @@ int zmq::tune_tcp_keepalives (fd_t s_, #else #ifdef ZMQ_HAVE_SO_KEEPALIVE if (keepalive_ != -1) { - int rc = setsockopt (s_, SOL_SOCKET, SO_KEEPALIVE, (char *) &keepalive_, - sizeof (int)); + int rc = + setsockopt (s_, SOL_SOCKET, SO_KEEPALIVE, + reinterpret_cast (&keepalive_), sizeof (int)); tcp_assert_tuning_error (s_, rc); if (rc != 0) return rc; @@ -292,7 +293,7 @@ int zmq::tcp_read (fd_t s_, void *data_, size_t size_) #else - const ssize_t rc = recv (s_, (char *) data_, size_, 0); + const ssize_t rc = recv (s_, static_cast (data_), size_, 0); // Several errors are OK. When speculative read is being done we may not // be able to read a single byte from the socket. Also, SIGSTOP issued diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 80112a6b..ba6eb525 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -291,7 +291,8 @@ zmq::fd_t zmq::tcp_listener_t::accept () socklen_t ss_len = sizeof (ss); #endif #if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4 - fd_t sock = ::accept4 (_s, (struct sockaddr *) &ss, &ss_len, SOCK_CLOEXEC); + fd_t sock = ::accept4 (_s, reinterpret_cast (&ss), + &ss_len, SOCK_CLOEXEC); #else fd_t sock = ::accept (_s, reinterpret_cast (&ss), &ss_len); @@ -318,7 +319,7 @@ zmq::fd_t zmq::tcp_listener_t::accept () for (options_t::tcp_accept_filters_t::size_type i = 0; i != options.tcp_accept_filters.size (); ++i) { if (options.tcp_accept_filters[i].match_address ( - (struct sockaddr *) &ss, ss_len)) { + reinterpret_cast (&ss), ss_len)) { matched = true; break; } diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp index a9691930..5e657abc 100644 --- a/src/udp_engine.cpp +++ b/src/udp_engine.cpp @@ -457,8 +457,9 @@ void zmq::udp_engine_t::in_event () return; } #else - int nbytes = recvfrom (_fd, _in_buffer, MAX_UDP_MSG, 0, - (sockaddr *) &in_address, &in_addrlen); + int nbytes = + recvfrom (_fd, _in_buffer, MAX_UDP_MSG, 0, + reinterpret_cast (&in_address), &in_addrlen); if (nbytes == -1) { #if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE errno_assert (errno != EBADF && errno != EFAULT && errno != ENOMEM diff --git a/src/zmq.cpp b/src/zmq.cpp index 7651cb75..5e765f43 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -831,7 +831,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) pollfd *pollfds = spollfds; if (nitems_ > ZMQ_POLLITEMS_DFLT) { - pollfds = (pollfd *) malloc (nitems_ * sizeof (pollfd)); + pollfds = static_cast (malloc (nitems_ * sizeof (pollfd))); alloc_assert (pollfds); }