aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/utils/socket
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-12-20 09:42:36 -0500
committerJack Lloyd <[email protected]>2017-12-20 09:42:36 -0500
commitc556cac5b6fc366502ed7f255fcc99918ce152c8 (patch)
treec4ab26edd10dbf9ee3de8753cf6bb3b0763f1bd3 /src/lib/utils/socket
parent752c549f8a56b01a77700e13f04988f52fac4d79 (diff)
Fix some shadow and unused parameter warnings
Diffstat (limited to 'src/lib/utils/socket')
-rw-r--r--src/lib/utils/socket/socket.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/utils/socket/socket.cpp b/src/lib/utils/socket/socket.cpp
index f263531dd..e7ed7e7e5 100644
--- a/src/lib/utils/socket/socket.cpp
+++ b/src/lib/utils/socket/socket.cpp
@@ -238,12 +238,12 @@ class BSD_Socket final : public OS::Socket
int active = 0;
if(nonblocking_connect_in_progress())
{
- struct timeval timeout = make_timeout_tv();
+ struct timeval timeout_tv = make_timeout_tv();
fd_set write_set;
FD_ZERO(&write_set);
FD_SET(m_socket, &write_set);
- active = ::select(m_socket + 1, nullptr, &write_set, nullptr, &timeout);
+ active = ::select(m_socket + 1, nullptr, &write_set, nullptr, &timeout_tv);
if(active)
{