summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-09-08 14:16:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-09-08 14:16:08 (GMT)
commitceb4d1ae2e8ce79d4e499fd8763990f3e1ac67e5 (patch)
tree1982db3214424a2ef0fa232d1ceb990f33756b73 /unix/tclUnixSock.c
parent0eddd55ab6d8747fd749f24f769a4025e5863e8b (diff)
parent607e3a5ba3c721c845b29c89db243882f25c5ba5 (diff)
downloadtcl-ceb4d1ae2e8ce79d4e499fd8763990f3e1ac67e5.zip
tcl-ceb4d1ae2e8ce79d4e499fd8763990f3e1ac67e5.tar.gz
tcl-ceb4d1ae2e8ce79d4e499fd8763990f3e1ac67e5.tar.bz2
Merge 8.7
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 1c07e8d..217d5ce 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -53,9 +53,9 @@ typedef struct TcpFdList {
struct TcpState {
Tcl_Channel channel; /* Channel associated with this file. */
- TcpFdList fds; /* The file descriptors of the sockets. */
int flags; /* ORed combination of the bitfields defined
* below. */
+ TcpFdList fds; /* The file descriptors of the sockets. */
int interest; /* Event types of interest */
/*
@@ -78,8 +78,6 @@ struct TcpState {
* an async socket is not yet connected. */
int connectError; /* Cache SO_ERROR of async socket. */
int cachedBlocking; /* Cache blocking mode of async socket. */
- int testFlags; /* bit field for tests. Is set by testsocket
- * test procedure */
};
/*
@@ -95,12 +93,7 @@ struct TcpState {
* still pending */
#define TCP_ASYNC_FAILED (1<<5) /* An async connect finally failed */
-/*
- * These bits may be ORed together into the "testFlags" field of a TcpState
- * structure.
- */
-
-#define TCP_ASYNC_TEST_MODE (1<<0) /* Async testing activated. Do not
+#define TCP_ASYNC_TEST_MODE (1<<8) /* Async testing activated. Do not
* automatically continue connection
* process. */
@@ -471,7 +464,7 @@ WaitForConnect(
* (errorCodePtr != NULL && !GOT_BITS(flags, TCP_NONBLOCKING))
*/
- if (GOT_BITS(statePtr->testFlags, TCP_ASYNC_TEST_MODE)
+ if (GOT_BITS(statePtr->flags, TCP_ASYNC_TEST_MODE)
&& !(errorCodePtr != NULL
&& !GOT_BITS(statePtr->flags, TCP_NONBLOCKING))) {
*errorCodePtr = EWOULDBLOCK;