diff --git a/libretro_version_1.c b/libretro_version_1.c index 7405773f53..86a1479d02 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -90,9 +90,7 @@ static void video_frame(const void *data, unsigned width, if (g_extern.filter.filter && data) { - unsigned owidth = 0; - unsigned oheight = 0; - unsigned opitch = 0; + unsigned owidth = 0, oheight = 0, opitch = 0; rarch_softfilter_get_output_size(g_extern.filter.filter, &owidth, &oheight, width, height); @@ -469,7 +467,6 @@ static int16_t input_state(unsigned port, unsigned device, * input_poll_overlay: * * Poll pressed buttons/keys on currently active overlay. - * **/ static inline void input_poll_overlay(void) { diff --git a/netplay.c b/netplay.c index 358c0b2378..690bab16e5 100644 --- a/netplay.c +++ b/netplay.c @@ -285,39 +285,30 @@ static int init_tcp_connection(const struct addrinfo *res, goto end; } } - else if (spectate) - { - int yes = 1; - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, CONST_CAST &yes, sizeof(int)); - - if (bind(fd, res->ai_addr, res->ai_addrlen) < 0 || - listen(fd, MAX_SPECTATORS) < 0) - { - ret = false; - goto end; - } - } else { int yes = 1; setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, CONST_CAST &yes, sizeof(int)); if (bind(fd, res->ai_addr, res->ai_addrlen) < 0 || - listen(fd, 1) < 0) + listen(fd, spectate ? MAX_SPECTATORS : 1) < 0) { ret = false; goto end; } - int new_fd = accept(fd, other_addr, &addr_size); - if (new_fd < 0) + if (!spectate) { - ret = false; - goto end; - } + int new_fd = accept(fd, other_addr, &addr_size); + if (new_fd < 0) + { + ret = false; + goto end; + } - close(fd); - fd = new_fd; + close(fd); + fd = new_fd; + } } end: