diff options
| author | max <max@tclers.tk> | 2012-06-26 08:05:18 (GMT) |
|---|---|---|
| committer | max <max@tclers.tk> | 2012-06-26 08:05:18 (GMT) |
| commit | 4224d0a2e6ab6bbe9c3e6f84487cbf9371a168c1 (patch) | |
| tree | 23048c867d271af90c3f916a04714fda3de840b3 | |
| parent | ee31f09c473f73d2089d8c95d2e244222d4d247b (diff) | |
| download | tcl-4224d0a2e6ab6bbe9c3e6f84487cbf9371a168c1.zip tcl-4224d0a2e6ab6bbe9c3e6f84487cbf9371a168c1.tar.gz tcl-4224d0a2e6ab6bbe9c3e6f84487cbf9371a168c1.tar.bz2 | |
Use EAI_SYSTEM only if it exists.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclIOSock.c | 7 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 7 |
3 files changed, 11 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2012-06-26 Reinhard Max <max@suse.de> + + * generic/tclIOSock.c: Use EAI_SYSTEM only if it exists. + * unix/tclUnixSock.c: + 2012-06-25 Don Porter <dgp@users.sourceforge.net> * generic/tclFileSystem.h: [Bug 3024359] Make sure that the diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c index 6a7be7e..ff23d5d 100644 --- a/generic/tclIOSock.c +++ b/generic/tclIOSock.c @@ -206,9 +206,12 @@ TclCreateSocketAddress( } if (result != 0) { - if (result != EAI_SYSTEM) { +#ifdef EAI_SYSTEM /* Doesn't exist on Windows */ + if (result == EAI_SYSTEM) + *errorMsgPtr = Tcl_PosixError(interp); + else +#endif *errorMsgPtr = gai_strerror(result); - } return 0; } diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index f6abfd5..1e9d4eb 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -1117,12 +1117,7 @@ Tcl_OpenTcpClient( freeaddrinfo(addrlist); } if (interp != NULL) { - Tcl_AppendResult(interp, "couldn't open socket: ", NULL); - if (errorMsg == NULL) { - Tcl_AppendResult(interp, Tcl_PosixError(interp), NULL); - } else { - Tcl_AppendResult(interp, errorMsg, NULL); - } + Tcl_AppendResult(interp, "couldn't open socket: ", errorMsg, NULL); } return NULL; } |