From 185fe09912be161b1dcdf5a96621322e8223fcf0 Mon Sep 17 00:00:00 2001 From: Chris Rienzo Date: Fri, 12 Jul 2019 19:07:21 +0000 Subject: [PATCH] FS-11903: Fix errors (again) reported by PVS-Studio Static Code Analyzer for switch_apr.c --- src/switch_apr.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/switch_apr.c b/src/switch_apr.c index 8337d0e5a4..25ff864129 100644 --- a/src/switch_apr.c +++ b/src/switch_apr.c @@ -837,27 +837,23 @@ SWITCH_DECLARE(switch_status_t) switch_sockaddr_info_get(switch_sockaddr_t ** sa SWITCH_DECLARE(switch_status_t) switch_socket_opt_set(switch_socket_t *sock, int32_t opt, int32_t on) { if (opt == SWITCH_SO_TCP_KEEPIDLE) { - int r = -10; - #if defined(TCP_KEEPIDLE) + int r = -10; r = setsockopt(sock->socketdes, SOL_TCP, TCP_KEEPIDLE, (void *)&on, sizeof(on)); + return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; #else return SWITCH_STATUS_NOTIMPL; #endif - - return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; } if (opt == SWITCH_SO_TCP_KEEPINTVL) { - int r = -10; - #if defined(TCP_KEEPINTVL) + int r = -10; r = setsockopt(sock->socketdes, SOL_TCP, TCP_KEEPINTVL, (void *)&on, sizeof(on)); + return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; #else return SWITCH_STATUS_NOTIMPL; #endif - - return r ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; } return apr_socket_opt_set(sock, opt, on);