From 6437e4b4a96a062fb643fef982b101cd5938fc48 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 23 Jan 2018 05:48:37 +0100 Subject: [PATCH] remove tons of unreferenced local variables --- network/netplay/netplay_frontend.c | 5 ++--- network/netplay/netplay_handshake.c | 2 +- network/netplay/netplay_io.c | 8 +------- network/netplay/netplay_sync.c | 6 +++--- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index ae8430c22c..9515fec3c3 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -115,10 +115,10 @@ static bool netplay_can_poll(netplay_t *netplay) */ static bool get_self_input_state(netplay_t *netplay) { + unsigned i; struct delta_frame *ptr = &netplay->buffer[netplay->self_ptr]; netplay_input_state_t istate = NULL; uint32_t devices, used_devices = 0, devi, dev_type, local_device; - size_t i; if (!netplay_delta_frame_ready(netplay, ptr, netplay->self_frame_count)) return false; @@ -192,7 +192,7 @@ static bool get_self_input_state(netplay_t *netplay) int16_t tmp_y = cb(local_device, dtype, 0, 1); state[1] = (uint16_t)tmp_x | (((uint16_t)tmp_y) << 16); for (i = 2; - i <= ((dtype == RETRO_DEVICE_MOUSE) ? + i <= (unsigned)((dtype == RETRO_DEVICE_MOUSE) ? RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN : RETRO_DEVICE_ID_LIGHTGUN_START); i++) @@ -1246,7 +1246,6 @@ uint8_t netplay_settings_share_mode(void) */ static void netplay_toggle_play_spectate(netplay_t *netplay) { - size_t i; enum rarch_netplay_connection_mode mode; if (netplay->self_mode == NETPLAY_CONNECTION_PLAYING || diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c index 916583b237..a005a963fc 100644 --- a/network/netplay/netplay_handshake.c +++ b/network/netplay/netplay_handshake.c @@ -938,7 +938,7 @@ bool netplay_handshake_pre_sync(netplay_t *netplay, struct netplay_connection *connection, bool *had_input) { uint32_t cmd[2]; - uint32_t new_frame_count, client_num, flip_frame; + uint32_t new_frame_count, client_num; uint32_t device; uint32_t local_sram_size, remote_sram_size; size_t i, j; diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c index 6fa5b0f5e4..c06fd16fde 100644 --- a/network/netplay/netplay_io.c +++ b/network/netplay/netplay_io.c @@ -289,10 +289,8 @@ static bool send_input_frame(netplay_t *netplay, struct delta_frame *dframe, bool netplay_send_cur_input(netplay_t *netplay, struct netplay_connection *connection) { - struct delta_frame *dframe = &netplay->buffer[netplay->self_ptr]; uint32_t from_client, to_client; - size_t i; - netplay_input_state_t istate; + struct delta_frame *dframe = &netplay->buffer[netplay->self_ptr]; if (netplay->is_server) { @@ -910,10 +908,8 @@ static bool netplay_get_cmd(netplay_t *netplay, struct netplay_connection *connection, bool *had_input) { uint32_t cmd; - uint32_t flip_frame; uint32_t cmd_size; ssize_t recvd; - char msg[512]; /* We don't handle the initial handshake here */ if (connection->mode < NETPLAY_CONNECTION_CONNECTED) @@ -949,7 +945,6 @@ static bool netplay_get_cmd(netplay_t *netplay, case NETPLAY_CMD_INPUT: { uint32_t frame_num, client_num, input_size, devices, device; - unsigned i; struct delta_frame *dframe; if (cmd_size < 2*sizeof(uint32_t)) @@ -1324,7 +1319,6 @@ static bool netplay_get_cmd(netplay_t *netplay, else { uint32_t frame_count; - netplay_input_state_t istate; /* It wants future frames, make sure we don't capture or send intermediate ones */ START(netplay->self_ptr); diff --git a/network/netplay/netplay_sync.c b/network/netplay/netplay_sync.c index a40404f646..a912b43a82 100644 --- a/network/netplay/netplay_sync.c +++ b/network/netplay/netplay_sync.c @@ -228,9 +228,9 @@ static void merge_analog_part(netplay_t *netplay, uint32_t device, uint32_t clients, uint32_t word, uint8_t bit) { netplay_input_state_t simstate; - uint32_t client, client_count = 0;; - uint8_t share_mode = netplay->device_share_modes[device] & NETPLAY_SHARE_ANALOG_BITS; - int32_t value = 0, new_value; + uint32_t client, client_count = 0; + uint8_t share_mode = netplay->device_share_modes[device] & NETPLAY_SHARE_ANALOG_BITS; + int32_t value = 0, new_value; /* Make sure all real clients are accounted for */ for (simstate = simframe->real_input[device]; simstate; simstate = simstate->next)