From 724408ceb828781cf73001020ecc83a1b730ac95 Mon Sep 17 00:00:00 2001 From: loonycyborg Date: Wed, 1 Jun 2016 13:24:50 +0300 Subject: [PATCH] Fixed -Wold-style-cast warnings --- src/SDL_SavePNG/savepng.cpp | 8 ++++---- src/network_worker.cpp | 4 ++-- src/server/server.cpp | 16 ++++++++-------- src/server/server.hpp | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/SDL_SavePNG/savepng.cpp b/src/SDL_SavePNG/savepng.cpp index fa6736a0313c..be026e0cb645 100644 --- a/src/SDL_SavePNG/savepng.cpp +++ b/src/SDL_SavePNG/savepng.cpp @@ -35,7 +35,7 @@ static void png_error_SDL(png_structp /*ctx*/, png_const_charp str) } static void png_write_SDL(png_structp png_ptr, png_bytep data, png_size_t length) { - SDL_RWops *rw = (SDL_RWops*)png_get_io_ptr(png_ptr); + SDL_RWops *rw = static_cast(png_get_io_ptr(png_ptr)); SDL_RWwrite(rw, data, sizeof(png_byte), length); } @@ -114,7 +114,7 @@ int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst) && (pal = surface->format->palette)) { colortype |= PNG_COLOR_MASK_PALETTE; - pal_ptr = (png_colorp)malloc(pal->ncolors * sizeof(png_color)); + pal_ptr = static_cast(malloc(pal->ncolors * sizeof(png_color))); for (i = 0; i < pal->ncolors; i++) { pal_ptr[i].red = pal->colors[i].r; pal_ptr[i].green = pal->colors[i].g; @@ -140,9 +140,9 @@ int SDL_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst) /* Write everything */ png_write_info(png_ptr, info_ptr); #ifdef USE_ROW_POINTERS - row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*surface->h); + row_pointers = static_cast (malloc(sizeof(png_bytep)*surface->h)); for (i = 0; i < surface->h; i++) - row_pointers[i] = (png_bytep)(Uint8*)surface->pixels + i * surface->pitch; + row_pointers[i] = static_cast(static_cast(surface->pixels)) + i * surface->pitch; png_write_image(png_ptr, row_pointers); free(row_pointers); #else diff --git a/src/network_worker.cpp b/src/network_worker.cpp index 6a23cb4f2cbe..f41c7d4eacbe 100644 --- a/src/network_worker.cpp +++ b/src/network_worker.cpp @@ -398,7 +398,7 @@ static SOCKET_STATE send_buffer(TCPsocket sock, std::vector& buf, int in_s } #ifdef USE_POLL - struct pollfd fd = { ((_TCPsocket*)sock)->channel, POLLOUT, 0 }; + struct pollfd fd = { (reinterpret_cast<_TCPsocket*>(sock))->channel, POLLOUT, 0 }; int poll_res; do { poll_res = poll(&fd, 1, 60000); @@ -780,7 +780,7 @@ manager::manager(size_t p_min_threads,size_t p_max_threads) : active_(!managed) for(size_t shard = 0; shard != NUM_SHARDS; ++shard) { const threading::lock lock(*shard_mutexes[shard]); for(size_t n = 0; n != p_min_threads; ++n) { - threading::thread * tmp = new threading::thread(process_queue,(void*)(shard)); + threading::thread * tmp = new threading::thread(process_queue,reinterpret_cast(shard)); threads[shard][tmp->get_id()] = tmp; } } diff --git a/src/server/server.cpp b/src/server/server.cpp index fe99bbeb18c0..7d067a12020a 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -750,19 +750,19 @@ void server::accept_connection(const boost::system::error_code& error, socket_pt void server::serverside_handshake(socket_ptr socket) { - boost::shared_array handshake(new unsigned char[4]); + boost::shared_array handshake(new char[4]); async_read( *socket, boost::asio::buffer(handshake.get(), 4), boost::bind(&server::handle_handshake, this, _1, socket, handshake) ); } -void server::handle_handshake(const boost::system::error_code& error, socket_ptr socket, boost::shared_array handshake) +void server::handle_handshake(const boost::system::error_code& error, socket_ptr socket, boost::shared_array handshake) { if(check_error(error, socket)) return; - if(strcmp((const char*)handshake.get(), "\0\0\0\0") != 0) { + if(strcmp(handshake.get(), "\0\0\0\0") != 0) { ERR_SERVER << client_address(socket) << "\tincorrect handshake\n"; return; } @@ -934,16 +934,16 @@ void server::handle_login(socket_ptr socket, boost::shared_ptr(socket.get())].empty()) { send_password_request(socket, "Please try again.", username, MP_NO_SEED_ERROR); return; } // This name is registered and an incorrect password provided - else if(!(user_handler_->login(username, password, seeds_[(unsigned long)socket.get()]))) { + else if(!(user_handler_->login(username, password, seeds_[reinterpret_cast(socket.get())]))) { const time_t now = time(NULL); // Reset the random seed - seeds_.erase((unsigned long)socket.get()); + seeds_.erase(reinterpret_cast(socket.get())); login_log login_ip = login_log(client_address(socket), 0, now); std::deque::iterator i = std::find(failed_logins_.begin(), failed_logins_.end(), login_ip); @@ -982,7 +982,7 @@ void server::handle_login(socket_ptr socket, boost::shared_ptr(socket.get())); user_handler_->user_logged_in(username); } } @@ -1051,7 +1051,7 @@ void server::send_password_request(socket_ptr socket, const std::string& msg, return; } - seeds_[(long int)(socket.get())] = salt; + seeds_[reinterpret_cast(socket.get())] = salt; simple_wml::document doc; simple_wml::node& e = doc.root().add_child("error"); diff --git a/src/server/server.hpp b/src/server/server.hpp index c1d122e24ca7..da628ca45948 100644 --- a/src/server/server.hpp +++ b/src/server/server.hpp @@ -48,7 +48,7 @@ class server char buf[4]; } handshake_response_; void serverside_handshake(socket_ptr socket); - void handle_handshake(const boost::system::error_code& error, socket_ptr socket, boost::shared_array buf); + void handle_handshake(const boost::system::error_code& error, socket_ptr socket, boost::shared_array buf); void request_version(const boost::system::error_code& error, socket_ptr socket); void handle_version(socket_ptr socket);