summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-09-08 12:22:25 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-09-08 12:22:25 (GMT)
commit498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f (patch)
treef200dbc1517d00c2c1f81926ce115bc485a9aed2 /unix/tclUnixSock.c
parente1f4100c039c4d48b36b43317861594cda900e55 (diff)
parent9e2fa9ea7edc34ebf959378f2bdbe0521bd7d2e4 (diff)
downloadtcl-498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f.zip
tcl-498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f.tar.gz
tcl-498f733a1bd10ee1f6e8f97a3f8f4021ac9faa1f.tar.bz2
merge 8.6.1
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 528f009..a6360c2 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1131,7 +1131,7 @@ Tcl_OpenTcpClient(
{
TcpState *state;
const char *errorMsg = NULL;
- struct addrinfo *addrlist = NULL, *myaddrlist = NULL;
+ void *addrlist = NULL, *myaddrlist = NULL;
char channelName[SOCK_CHAN_LENGTH];
/*
@@ -1276,7 +1276,8 @@ Tcl_OpenTcpServer(
ClientData acceptProcData) /* Data for the callback. */
{
int status = 0, sock = -1, reuseaddr = 1, chosenport = 0;
- struct addrinfo *addrlist = NULL, *addrPtr; /* socket address */
+ void *addrlist = NULL;
+ struct addrinfo *addrPtr; /* socket address */
TcpState *statePtr = NULL;
char channelName[SOCK_CHAN_LENGTH];
const char *errorMsg = NULL;
@@ -1357,6 +1358,7 @@ Tcl_OpenTcpServer(
my_errno = errno;
}
close(sock);
+ sock = -1;
continue;
}
if (port == 0 && chosenport == 0) {
@@ -1379,6 +1381,7 @@ Tcl_OpenTcpServer(
my_errno = errno;
}
close(sock);
+ sock = -1;
continue;
}
if (statePtr == NULL) {