summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixChan.c
diff options
context:
space:
mode:
Diffstat (limited to 'unix/tclUnixChan.c')
-rw-r--r--unix/tclUnixChan.c42
1 files changed, 6 insertions, 36 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 22da743..0d2c046 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixChan.c,v 1.42.2.8 2006/09/06 13:08:30 vasiljevic Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.42.2.9 2006/09/07 08:50:35 vasiljevic Exp $
*/
#include "tclInt.h" /* Internal definitions for Tcl. */
@@ -2301,26 +2301,15 @@ TcpGetOptionProc(instanceData, interp, optionName, dsPtr)
(strncmp(optionName, "-peername", len) == 0))) {
if (getpeername(statePtr->fd, (struct sockaddr *) &peername,
&size) >= 0) {
-#ifdef TCL_THREADS
- int buflen = 1024, herrno;
- char hbuf[1024];
- struct hostent he;
-#endif
if (len == 0) {
Tcl_DStringAppendElement(dsPtr, "-peername");
Tcl_DStringStartSublist(dsPtr);
}
Tcl_DStringAppendElement(dsPtr, inet_ntoa(peername.sin_addr));
-#ifdef TCL_THREADS
- hostEntPtr = TclpGetHostByAddr( /* INTL: Native. */
- (char *) &peername.sin_addr, sizeof(peername.sin_addr),
- AF_INET, &he, hbuf, buflen, &herrno);
-#else
- hostEntPtr = gethostbyaddr( /* INTL: Native. */
+ hostEntPtr = TclpGetHostByAddr( /* INTL: Native. */
(char *) &peername.sin_addr,
sizeof(peername.sin_addr), AF_INET);
-#endif
- if (hostEntPtr != NULL) {
+ if (hostEntPtr != (struct hostent *) NULL) {
Tcl_DString ds;
Tcl_ExternalToUtfDString(NULL, hostEntPtr->h_name, -1, &ds);
@@ -2359,25 +2348,14 @@ TcpGetOptionProc(instanceData, interp, optionName, dsPtr)
(strncmp(optionName, "-sockname", len) == 0))) {
if (getsockname(statePtr->fd, (struct sockaddr *) &sockname,
&size) >= 0) {
-#ifdef TCL_THREADS
- int buflen = 1024, herrno;
- char hbuf[1024];
- struct hostent he;
-#endif
if (len == 0) {
Tcl_DStringAppendElement(dsPtr, "-sockname");
Tcl_DStringStartSublist(dsPtr);
}
Tcl_DStringAppendElement(dsPtr, inet_ntoa(sockname.sin_addr));
-#ifdef TCL_THREADS
- hostEntPtr = TclpGetHostByAddr( /* INTL: Native. */
- (char *) &sockname.sin_addr, sizeof(sockname.sin_addr),
- AF_INET, &he, hbuf, buflen, &herrno);
-#else
- hostEntPtr = gethostbyaddr( /* INTL: Native. */
+ hostEntPtr = TclpGetHostByAddr( /* INTL: Native. */
(char *) &sockname.sin_addr,
sizeof(sockname.sin_addr), AF_INET);
-#endif
if (hostEntPtr != (struct hostent *) NULL) {
Tcl_DString ds;
@@ -2708,16 +2686,8 @@ CreateSocketAddress(sockaddrPtr, host, port)
* on either 32 or 64 bits systems.
*/
if (addr.s_addr == 0xFFFFFFFF) {
-#ifdef TCL_THREADS
- int buflen = 1024, herrno;
- char hbuf[1024];
- struct hostent he;
- hostent = TclpGetHostByName( /* INTL: Native. */
- native, &he, hbuf, buflen, &herrno);
-#else
- hostent = gethostbyname(native); /* INTL: Native. */
-#endif
- if (hostent != NULL) {
+ hostent = TclpGetHostByName(native); /* INTL: Native. */
+ if (hostent != (struct hostent *) NULL) {
memcpy((VOID *) &addr,
(VOID *) hostent->h_addr_list[0],
(size_t) hostent->h_length);