--- libwww/Library/src/HTTCP.c	1996/11/07 18:47:36	2.94.2.7
+++ libwww/Library/src/HTTCP.c	1996/11/18 05:01:28	2.94.2.8
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTTCP.c,v 2.94.2.7 1996/11/07 18:47:36 frystyk Exp $
+**	@(#) $Id: HTTCP.c,v 2.94.2.8 1996/11/18 05:01:28 eric Exp $
 **
 **	This code is in common between client and server sides.
 **
@@ -94,7 +94,7 @@ PRIVATE int _makeSocket(HTHost * host, H
 	host->tcpstate = TCP_ERROR;
 	return -1;
 	}
-    HTWATCH(PROT_TRACE, host, HTHIDE("Socket...... Created %d\n"), sockfd);
+    if (PROT_TRACE) HTWATCH(PROT_TRACE, host, HTHIDE("Socket...... Created %d\n"), sockfd);
 
     /* Increase the number of sockets by one */
     HTNet_increaseSocket();
@@ -136,9 +136,9 @@ PRIVATE int _makeSocket(HTHost * host, H
 	}
 #endif /* !VMS */
 #endif /* !_WINSOCKAPI_ */
-	HTWATCH(PROT_TRACE, host, HTHIDE("Socket...... %slocking socket\n"), status == -1 ? "B" : "Non-b");
+	if (PROT_TRACE) HTWATCH(PROT_TRACE, host, HTHIDE("Socket...... %slocking socket\n"), status == -1 ? "B" : "Non-b");
     } else
-	HTWATCH(PROT_TRACE, host, HTHIDE("Socket...... Blocking socket\n"));
+	if (PROT_TRACE) HTWATCH(PROT_TRACE, host, HTHIDE("Socket...... Blocking socket\n"));
 
     /*
     **  Associate the channel with the host and create an input and and output stream
@@ -201,7 +201,7 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 	      ** which is setting up a channel
 	      */
 	      me->tcpstate = TCP_CHANNEL;
-	      HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CHANNEL.\n"), me);
+	      if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CHANNEL.\n"), me);
 	      if (status == HT_PENDING) return HT_PENDING;
 	  }
 	  break;
@@ -215,7 +215,7 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 	    */
 	    if (HTHost_channel(me) == NULL) {
 		me->tcpstate = TCP_DNS;
-		HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_DNS.\n"), me);
+		if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_DNS.\n"), me);
 	    } else {
 
 		/*
@@ -237,26 +237,26 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 		**  We are now all set and can jump to connected mode
 		*/
 		me->tcpstate = TCP_CONNECTED;
-		HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CONNECTED.\n"), me);
+		if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CONNECTED.\n"), me);
 	    }
 	    hostname = HTHost_name(me);
 	    break;
 
 	case TCP_DNS:
 	    if ((status = HTParseInet(me, hostname, request)) < 0) {
-		HTWATCH(PROT_TRACE, me, HTHIDE("HTDoConnect. Can't locate `%s\'\n"), hostname);
+		if (PROT_TRACE) HTWATCH(PROT_TRACE, me, HTHIDE("HTDoConnect. Can't locate `%s\'\n"), hostname);
 		HTRequest_addError(request, ERR_FATAL, NO,
 				   HTERR_NO_REMOTE_HOST,
 				   (void *) hostname, strlen(hostname),
 				   "HTDoConnect");
 		me->tcpstate = TCP_ERROR;
-		HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_ERROR.\n"), me);
+		if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_ERROR.\n"), me);
 		break;
 	    }
 	    if (!retry && status > 1)		/* If multiple homes */
 		retry = status;
 	    me->tcpstate = TCP_NEED_SOCKET;
-	    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_SOCKET.\n"), me);
+	    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_SOCKET.\n"), me);
 	    break;
 
 	  case TCP_NEED_SOCKET:
@@ -285,7 +285,7 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 				NULL, hostname, NULL);
 	    }
 	    me->tcpstate = TCP_NEED_CONNECT;
-	    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_CONNECT.\n"), me);
+	    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_CONNECT.\n"), me);
 	    break;
 	  case TCP_NEED_CONNECT:
 	    status = connect(HTChannel_socket(me->channel), (struct sockaddr *) &me->sock_addr,
@@ -312,19 +312,19 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 	    {
 		if (NETCALL_WOULDBLOCK(socerrno))
 		{
-		    HTWATCH(PROT_TRACE, me, HTHIDE("HTDoConnect. WOULD BLOCK `%s'\n"), hostname);
+		    if (PROT_TRACE) HTWATCH(PROT_TRACE, me, HTHIDE("HTDoConnect. WOULD BLOCK `%s'\n"), hostname);
 		    HTHost_register(me, net, HTEvent_CONNECT);
 		    return HT_WOULD_BLOCK;
 		}
 		if (socerrno == EISCONN) {
 		    me->tcpstate = TCP_CONNECTED;
-		    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CONNECTED.\n"), me);
+		    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CONNECTED.\n"), me);
 		    break;
 		}
 		if (NETCALL_DEADSOCKET(socerrno))     /* We lost the socket */
 		{
 		    me->tcpstate = TCP_NEED_SOCKET;
-		    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_SOCKET.\n"), me);
+		    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_SOCKET.\n"), me);
 		    break;
 		}
 		if (retry) {
@@ -347,10 +347,10 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 		    HTDNS_updateWeigths(me->dns, me->home, me->connecttime);
 		}
 		me->tcpstate = TCP_ERROR;		
-		HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_ERROR.\n"), me);
+		if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_ERROR.\n"), me);
 	    } else {
 		me->tcpstate = TCP_CONNECTED;
-		HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CONNECTED.\n"), me);
+		if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_CONNECTED.\n"), me);
 	    }
 	    break;
 
@@ -362,7 +362,7 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 	    }
 	    retry = 0;
 	    me->tcpstate = TCP_BEGIN;
-	    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p connected.\n"), me);
+	    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p connected.\n"), me);
 	    return HT_OK;
 	    break;
 
@@ -378,7 +378,7 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 		if (HTHost_isPersistent(me)) {	 /* Inherited socket */
 		    HTHost_setPersistent(me, NO, HT_TP_SINGLE);
 		    me->tcpstate = TCP_NEED_SOCKET;
-		    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_SOCKET.\n"), me);
+		    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_NEED_SOCKET.\n"), me);
 		    break;
 		}
 #endif
@@ -389,14 +389,14 @@ PUBLIC int HTDoConnect (HTNet * net, cha
 	        HTRequest_addSystemError(request, ERR_NON_FATAL, socerrno, NO,
 			      "connect");
 		me->tcpstate = TCP_DNS;
-		HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_DNS.\n"), me);
+		if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_DNS.\n"), me);
 		break;
 	    }
 	    HTRequest_addSystemError(request, ERR_FATAL,socerrno,NO,"connect");
 	    HTDNS_delete(hostname);
 	    retry = 0;
 	    me->tcpstate = TCP_BEGIN;
-	    HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_BEGIN.\n"), me);
+	    if (PROT_TRACE) HTWATCH(HTWatch_TCP, me, HTHIDE("HTHost %p going to state TCP_BEGIN.\n"), me);
 	    return HT_ERROR;
 	    break;
 	}