---------------------
PatchSet 2538 
Date: 2001/06/14 21:34:24
Author: serassio
Branch: nt-2_3
Tag: (none) 
Log:
Backport of revised Windows NT code from 2.5 DEVEL branch - Some cosmetic changes

Members: 
	lib/dlmalloc.c:1.1.1.1.44.1->1.1.1.1.44.2 
	src/disk.c:1.1.1.3.4.1.2.3->1.1.1.3.4.1.2.4 
	src/dns.c:1.1.1.3.4.1.2.1->1.1.1.3.4.1.2.2 
	src/dnsserver.c:1.1.1.3.4.1.2.2->1.1.1.3.4.1.2.3 
	src/forward.c:1.1.1.3.4.1.2.1->1.1.1.3.4.1.2.2 
	src/htcp.c:1.1.1.2.4.1.2.1->1.1.1.2.4.1.2.2 
	src/icp_v2.c:1.1.1.3.4.1.2.1->1.1.1.3.4.1.2.2 
	src/leakfinder.c:1.1.1.1.4.1.2.1->1.1.1.1.4.1.2.2 
	src/main.c:1.1.1.3.4.2.2.4->1.1.1.3.4.2.2.5 
	src/store_dir.c:1.1.1.3.4.2.2.3->1.1.1.3.4.2.2.4 
	src/tools.c:1.1.1.3.4.1.2.4->1.1.1.3.4.1.2.5 
	src/url.c:1.1.1.3.4.4.2.2->1.1.1.3.4.4.2.3 
	src/useragent.c:1.1.1.3.4.1.2.3->1.1.1.3.4.1.2.4 

Index: squid/lib/dlmalloc.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/dlmalloc.c,v
retrieving revision 1.1.1.1.44.1
retrieving revision 1.1.1.1.44.2
diff -u -r1.1.1.1.44.1 -r1.1.1.1.44.2
--- squid/lib/dlmalloc.c	6 Jan 2001 12:40:10 -0000	1.1.1.1.44.1
+++ squid/lib/dlmalloc.c	14 Jun 2001 21:34:24 -0000	1.1.1.1.44.2
@@ -1,5 +1,5 @@
 /*
- * $Id: dlmalloc.c,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
+ * $Id: dlmalloc.c,v 1.1.1.1.44.2 2001/06/14 21:34:24 serassio Exp $
  */
 
 /* ---------- To make a malloc.h, start cutting here ------------ */
@@ -319,7 +319,7 @@
 */
 
 /* #define WIN32 */
-#ifdef _SQUID_MSWIN_
+#ifdef WIN32
 #define MORECORE wsbrk
 #define HAVE_MMAP 0
 #endif
@@ -897,7 +897,7 @@
 */
 
 
-#ifdef _SQUID_MSWIN_
+#ifdef WIN32
 
 #define AlignPage(add) (((add) + (malloc_getpagesize-1)) &
 ~(malloc_getpagesize-1))
Index: squid/src/disk.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/disk.c,v
retrieving revision 1.1.1.3.4.1.2.3
retrieving revision 1.1.1.3.4.1.2.4
diff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4
--- squid/src/disk.c	14 Jun 2001 20:36:15 -0000	1.1.1.3.4.1.2.3
+++ squid/src/disk.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: disk.c,v 1.1.1.3.4.1.2.3 2001/06/14 20:36:15 serassio Exp $
+ * $Id: disk.c,v 1.1.1.3.4.1.2.4 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -71,13 +71,13 @@
 	mode |= _O_BINARY;
     errno = 0;
     if (mode & O_WRONLY) {
-		if (mode & O_TRUNC)
-		    strcpy(fmode,"wb");
-		else
-    		strcpy(fmode,"a+b");
+	if (mode & O_TRUNC)
+	    strcpy(fmode,"wb");
+	else
+    	    strcpy(fmode,"a+b");
 	}
 	else
-		strcpy(fmode,"rb");
+	    strcpy(fmode,"rb");
 	fbuf=fopen(path,fmode);
     fd = fileno(fbuf);
 #else
@@ -109,7 +109,7 @@
 #ifdef _SQUID_MSWIN_
 	FILE *fbuf;
 #endif
-	fde *F = &fd_table[fd];
+    fde *F = &fd_table[fd];
     PF *read_callback;
     assert(fd >= 0);
     assert(F->flags.open);
Index: squid/src/dns.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/dns.c,v
retrieving revision 1.1.1.3.4.1.2.1
retrieving revision 1.1.1.3.4.1.2.2
diff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2
--- squid/src/dns.c	6 Jan 2001 12:40:13 -0000	1.1.1.3.4.1.2.1
+++ squid/src/dns.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
+ * $Id: dns.c,v 1.1.1.3.4.1.2.2 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -83,42 +83,41 @@
 #endif
 
     if (!Config.Program.dnsserver)
-		return;
+	return;
 #ifdef _SQUID_MSWIN_
-	if (dnsservers == NULL)
-		dnsservers = xmalloc(sizeof(DNSPlugin));
-   	debug(34, 0) ("dnsInit: Loading %s\n", Config.Program.dnsserver);
-	dnsservers->hnd = LoadLibrary(Config.Program.dnsserver);
-	if (dnsservers->hnd == NULL) {
-    	debug(34, 0) ("dnsInit: Unable to load %s\n", Config.Program.dnsserver);
-		xfree(dnsservers);
-		Config.Program.dnsserver = 0;
-		return;
-	}
-	dnsservers->DNSLookup = (PFDNSLookup)GetProcAddress(dnsservers->hnd,"DNSLookup");
-	if (dnsservers->DNSLookup == NULL) {
-    	debug(34, 0) ("dnsInit: Invalid DNS plugin %s\n", Config.Program.dnsserver);
-		FreeLibrary(dnsservers->hnd);
-		xfree(dnsservers);
-		Config.Program.dnsserver = NULL;
-		return;
-	}		
-	dnsservers->Init = (PFInit)GetProcAddress(dnsservers->hnd,"Init");
-	if (dnsservers->Init == NULL) {
-    	debug(34, 0) ("dnsInit: Invalid DNS plugin %s\n", Config.Program.dnsserver);
+    if (dnsservers == NULL)
+	dnsservers = xmalloc(sizeof(DNSPlugin));
+    debug(34, 0) ("dnsInit: Loading %s\n", Config.Program.dnsserver);
+    dnsservers->hnd = LoadLibrary(Config.Program.dnsserver);
+    if (dnsservers->hnd == NULL) {
+	debug(34, 0) ("dnsInit: Unable to load %s\n", Config.Program.dnsserver);
+	xfree(dnsservers);
+	Config.Program.dnsserver = 0;
+	return;
+    }
+    dnsservers->DNSLookup = (PFDNSLookup)GetProcAddress(dnsservers->hnd,"DNSLookup");
+    if (dnsservers->DNSLookup == NULL) {
+	debug(34, 0) ("dnsInit: Invalid DNS plugin %s\n", Config.Program.dnsserver);
+	FreeLibrary(dnsservers->hnd);
+	xfree(dnsservers);
+	Config.Program.dnsserver = NULL;
+	return;
+    }
+    dnsservers->Init = (PFInit)GetProcAddress(dnsservers->hnd,"Init");
+    if (dnsservers->Init == NULL) {
+	debug(34, 0) ("dnsInit: Invalid DNS plugin %s\n", Config.Program.dnsserver);
 		FreeLibrary(dnsservers->hnd);
 		xfree(dnsservers);
 		Config.Program.dnsserver = NULL;
 		return;
 	}
     debug(34, 0) ("dnsInit: Initializing DNS plugin\n");
-	dnsservers->Init();		
-	
-	dnsservers->stats.requests=0;
-	dnsservers->stats.replies=0;
+    dnsservers->Init();		
+    dnsservers->stats.requests=0;
+    dnsservers->stats.replies=0;
 #else
     if (dnsservers == NULL)
-		dnsservers = helperCreate("dnsserver");
+	dnsservers = helperCreate("dnsserver");
     dnsservers->n_to_start = Config.dnsChildren;
     dnsservers->ipc_type = IPC_TCP_SOCKET;
     assert(dnsservers->cmdline == NULL);
@@ -144,14 +143,14 @@
 dnsShutdown(void)
 {
     if (!dnsservers)
-		return;
+	return;
 #ifdef _SQUID_MSWIN_
-	FreeLibrary(dnsservers->hnd);
-	xfree(dnsservers);
+    FreeLibrary(dnsservers->hnd);
+    xfree(dnsservers);
 #else
     helperShutdown(dnsservers);
     wordlistDestroy(&dnsservers->cmdline);
-		if (!shutting_down)
+    if (!shutting_down)
 	return;
     helperFree(dnsservers);
 #endif
Index: squid/src/dnsserver.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/dnsserver.c,v
retrieving revision 1.1.1.3.4.1.2.2
retrieving revision 1.1.1.3.4.1.2.3
diff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3
--- squid/src/dnsserver.c	3 Jun 2001 19:41:48 -0000	1.1.1.3.4.1.2.2
+++ squid/src/dnsserver.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dnsserver.c,v 1.1.1.3.4.1.2.2 2001/06/03 19:41:48 serassio Exp $
+ * $Id: dnsserver.c,v 1.1.1.3.4.1.2.3 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 0     DNS Resolver
  * AUTHOR: Harvest Derived
@@ -206,16 +206,16 @@
 
 #ifndef _SQUID_MSWIN_
     if (0 == strcmp(buf, "$shutdown"))
-		exit(0);
+	exit(0);
 #endif
     if (0 == strcmp(buf, "$hello")) {
 #ifdef _SQUID_MSWIN_
-		snprintf(reply,sizeof(reply),"$alive\n");
-		(callback)(data,reply);
-		return 0;
+	snprintf(reply,sizeof(reply),"$alive\n");
+	(callback)(data,reply);
+	return 0;
 #else
-		printf("$alive\n");
-	return;
+	printf("$alive\n");
+    return;
 #endif
     }
     /* check if it's already an IP address in text form. */
@@ -239,26 +239,26 @@
 #endif
     }
     if (NULL == result) {
-		if (h_errno == TRY_AGAIN) {
+	if (h_errno == TRY_AGAIN) {
 #ifdef _SQUID_MSWIN_
-			snprintf(reply,sizeof(reply),"$fail Name Server for domain '%s' is unavailable.\n", buf);
+	    snprintf(reply,sizeof(reply),"$fail Name Server for domain '%s' is unavailable.\n", buf);
 #else
-			printf("$fail Name Server for domain '%s' is unavailable.\n", buf);
+	    printf("$fail Name Server for domain '%s' is unavailable.\n", buf);
 #endif
-		} else {
+	} else {
 #ifdef _SQUID_MSWIN_
-			snprintf(reply,sizeof(reply),"$fail DNS Domain '%s' is invalid: %s.\n",
+	    snprintf(reply,sizeof(reply),"$fail DNS Domain '%s' is invalid: %s.\n",
 #else
-			printf("$fail DNS Domain '%s' is invalid: %s.\n",
+	    printf("$fail DNS Domain '%s' is invalid: %s.\n",
 #endif
-			buf, my_h_msgs(h_errno));
-		}
+		buf, my_h_msgs(h_errno));
+	}
 #ifdef _SQUID_MSWIN_
 
 	(callback)(data,reply);
 	return 0;
 #else
-		return;
+	return;
 #endif
     }
 #if LIBRESOLV_DNS_TTL_HACK
@@ -270,39 +270,38 @@
 #endif
     if (reverse) {
 #ifdef _SQUID_MSWIN_
-		snprintf(reply,sizeof(reply),"$name %d %s\n", ttl, result->h_name);
-		(callback)(data,reply);
-		return 0;
+	snprintf(reply,sizeof(reply),"$name %d %s\n", ttl, result->h_name);
+	(callback)(data,reply);
+	return 0;
     }
-	snprintf(reply,sizeof(reply),"$addr %d", ttl);
+    snprintf(reply,sizeof(reply),"$addr %d", ttl);
 #else
-		printf("$name %d %s\n", ttl, result->h_name);
-		return;
+	printf("$name %d %s\n", ttl, result->h_name);
+	return;
     }
     printf("$addr %d", ttl);
 #endif
     for (i = 0; NULL != result->h_addr_list[i]; i++) {
-		if (32 == i)
-			break;
-		xmemcpy(&addr, result->h_addr_list[i], sizeof(addr));
+	if (32 == i)
+	    break;
+	xmemcpy(&addr, result->h_addr_list[i], sizeof(addr));
 #ifdef _SQUID_MSWIN_
-		snprintf(tail,sizeof(tail)," %s", inet_ntoa(addr));
-		strcat(reply,tail);
-		(callback)(data,reply);
-		return 0;
-    }
-    snprintf(reply,sizeof(reply),"\n");
+	snprintf(tail,sizeof(tail)," %s", inet_ntoa(addr));
+	strcat(reply,tail);
 	(callback)(data,reply);
 	return 0;
+    }
+    snprintf(reply,sizeof(reply),"\n");
+    (callback)(data,reply);
+    return 0;
 #else
-		printf(" %s", inet_ntoa(addr));
+	printf(" %s", inet_ntoa(addr));
     }
     printf("\n");
 #endif
 }
 
 #ifndef _SQUID_MSWIN_
-
 static void
 usage(void)
 {
Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/forward.c,v
retrieving revision 1.1.1.3.4.1.2.1
retrieving revision 1.1.1.3.4.1.2.2
diff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2
--- squid/src/forward.c	6 Jan 2001 12:40:13 -0000	1.1.1.3.4.1.2.1
+++ squid/src/forward.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
+ * $Id: forward.c,v 1.1.1.3.4.1.2.2 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -248,9 +248,9 @@
     }
     fd = comm_open(SOCK_STREAM,
 #ifdef _SQUID_MSWIN_
-    IPPROTO_TCP,
+       IPPROTO_TCP,
 #else
-    0,
+       0,
 #endif
 	Config.Addrs.tcp_outgoing,
 	0,
Index: squid/src/htcp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/htcp.c,v
retrieving revision 1.1.1.2.4.1.2.1
retrieving revision 1.1.1.2.4.1.2.2
diff -u -r1.1.1.2.4.1.2.1 -r1.1.1.2.4.1.2.2
--- squid/src/htcp.c	6 Jan 2001 12:40:14 -0000	1.1.1.2.4.1.2.1
+++ squid/src/htcp.c	14 Jun 2001 21:34:24 -0000	1.1.1.2.4.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: htcp.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:14 hno Exp $
+ * $Id: htcp.c,v 1.1.1.2.4.1.2.2 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 31    Hypertext Caching Protocol
  * AUTHOR: Duane Wesssels
@@ -860,9 +860,9 @@
 	enter_suid();
 	htcpOutSocket = comm_open(SOCK_DGRAM,
 #ifdef _SQUID_MSWIN_
-		IPPROTO_UDP,
+	    IPPROTO_UDP,
 #else
-		0,
+	    0,
 #endif
 	    Config.Addrs.udp_outgoing,
 	    Config.Port.htcp,
Index: squid/src/icp_v2.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/icp_v2.c,v
retrieving revision 1.1.1.3.4.1.2.1
retrieving revision 1.1.1.3.4.1.2.2
diff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2
--- squid/src/icp_v2.c	6 Jan 2001 12:40:14 -0000	1.1.1.3.4.1.2.1
+++ squid/src/icp_v2.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v2.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
+ * $Id: icp_v2.c,v 1.1.1.3.4.1.2.2 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -439,9 +439,9 @@
 	enter_suid();
 	theOutIcpConnection = comm_open(SOCK_DGRAM,
 #ifdef _SQUID_MSWIN_
-		IPPROTO_UDP,
+	    IPPROTO_UDP,
 #else
-		0,
+	    0,
 #endif
 	    addr,
 	    port,
Index: squid/src/leakfinder.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/leakfinder.c,v
retrieving revision 1.1.1.1.4.1.2.1
retrieving revision 1.1.1.1.4.1.2.2
diff -u -r1.1.1.1.4.1.2.1 -r1.1.1.1.4.1.2.2
--- squid/src/leakfinder.c	6 Jan 2001 12:40:14 -0000	1.1.1.1.4.1.2.1
+++ squid/src/leakfinder.c	14 Jun 2001 21:34:24 -0000	1.1.1.1.4.1.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: leakfinder.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:14 hno Exp $
+ * $Id: leakfinder.c,v 1.1.1.1.4.1.2.2 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 45    Callback Data Registry
  * AUTHOR: Duane Wessels
@@ -97,8 +97,7 @@
     return p;
 }
 
-
-void * 
+void *
 leakFree(void *p)
 {
 #ifdef _SQUID_MSWIN_
Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/main.c,v
retrieving revision 1.1.1.3.4.2.2.4
retrieving revision 1.1.1.3.4.2.2.5
diff -u -r1.1.1.3.4.2.2.4 -r1.1.1.3.4.2.2.5
--- squid/src/main.c	14 Jun 2001 20:36:16 -0000	1.1.1.3.4.2.2.4
+++ squid/src/main.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.2.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.c,v 1.1.1.3.4.2.2.4 2001/06/14 20:36:16 serassio Exp $
+ * $Id: main.c,v 1.1.1.3.4.2.2.5 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -103,6 +103,8 @@
 #endif
 	"       -a port   Specify HTTP port number (default: %d).\n"
 	"       -d level  Write debugging to stderr also.\n"
+	"       -f file   Use given config-file instead of\n"
+	"                 %s\n"
 	"       -h        Print help message.\n"
 #if defined(USE_WIN32_SERVICE) && (defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_))
 	"       -i        Installs as a Windows Service (see -n option).\n"
@@ -136,7 +138,6 @@
 static void
 mainParseOptions(int argc, char *argv[])
 {
-
     extern char *optarg;
     int c;
 
@@ -225,7 +226,7 @@
 		usage();
 	    break;
 	case 'm':
-		if (optarg) {
+	    if (optarg) {
 #if MALLOC_DBG
 		malloc_debug_level = atoi(optarg);
 		/* NOTREACHED */
@@ -622,8 +623,8 @@
     int n;			/* # of GC'd objects */
     time_t loop_delay;
     mode_t oldmask;
-	
-    debug_log=stderr;
+
+    debug_log = stderr;
     if (FD_SETSIZE < Squid_MaxFD)
 	Squid_MaxFD = FD_SETSIZE;
 
@@ -641,7 +642,7 @@
 #endif
 #endif
 
-   /* call mallopt() before anything else */
+    /* call mallopt() before anything else */
 #if HAVE_MALLOPT
 #ifdef M_GRAIN
     /* Round up all sizes to a multiple of this */
@@ -772,8 +773,7 @@
 #if defined(USE_WIN32_SERVICE) && (defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_))
     WIN32_svcstatusupdate(SERVICE_START_PENDING);
 #endif
-	mainInitialize();
-	
+    mainInitialize();
 #if defined(USE_WIN32_SERVICE) && (defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_))
     WIN32_svcstatusupdate(SERVICE_RUNNING);
 #endif
Index: squid/src/store_dir.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_dir.c,v
retrieving revision 1.1.1.3.4.2.2.3
retrieving revision 1.1.1.3.4.2.2.4
diff -u -r1.1.1.3.4.2.2.3 -r1.1.1.3.4.2.2.4
--- squid/src/store_dir.c	14 Jun 2001 20:36:16 -0000	1.1.1.3.4.2.2.3
+++ squid/src/store_dir.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.2.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.c,v 1.1.1.3.4.2.2.3 2001/06/14 20:36:16 serassio Exp $
+ * $Id: store_dir.c,v 1.1.1.3.4.2.2.4 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -35,6 +35,11 @@
 #define STORE_DIR_C
 #include "squid.h"
 
+#if HAVE_STATVFS
+#if HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+#endif
 /* Windows uses sys/vfs.h */
 #if HAVE_SYS_VFS_H
 #include <sys/vfs.h>
Index: squid/src/tools.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/tools.c,v
retrieving revision 1.1.1.3.4.1.2.4
retrieving revision 1.1.1.3.4.1.2.5
diff -u -r1.1.1.3.4.1.2.4 -r1.1.1.3.4.1.2.5
--- squid/src/tools.c	14 Jun 2001 20:36:16 -0000	1.1.1.3.4.1.2.4
+++ squid/src/tools.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.c,v 1.1.1.3.4.1.2.4 2001/06/14 20:36:16 serassio Exp $
+ * $Id: tools.c,v 1.1.1.3.4.1.2.5 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -425,7 +425,6 @@
 fatalvf(const char *fmt, va_list args)
 {
     static char fatal_str[BUFSIZ];
-
     vsnprintf(fatal_str, sizeof(fatal_str), fmt, args);
     fatal(fatal_str);
 }
Index: squid/src/url.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/url.c,v
retrieving revision 1.1.1.3.4.4.2.2
retrieving revision 1.1.1.3.4.4.2.3
diff -u -r1.1.1.3.4.4.2.2 -r1.1.1.3.4.4.2.3
--- squid/src/url.c	14 Jun 2001 20:36:16 -0000	1.1.1.3.4.4.2.2
+++ squid/src/url.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.4.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.c,v 1.1.1.3.4.4.2.2 2001/06/14 20:36:16 serassio Exp $
+ * $Id: url.c,v 1.1.1.3.4.4.2.3 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -278,7 +278,7 @@
 	host[l] = '\0';
     /* remove duplicate dots */
     while ((t = strstr(host, "..")))
-	    xmemmove(t, t + 1, strlen(t));
+	xmemmove(t, t + 1, strlen(t));
     if (Config.appendDomain && !strchr(host, '.'))
 	strncat(host, Config.appendDomain, SQUIDHOSTNAMELEN);
     if (port == 0) {
Index: squid/src/useragent.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/useragent.c,v
retrieving revision 1.1.1.3.4.1.2.3
retrieving revision 1.1.1.3.4.1.2.4
diff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4
--- squid/src/useragent.c	14 Jun 2001 20:36:16 -0000	1.1.1.3.4.1.2.3
+++ squid/src/useragent.c	14 Jun 2001 21:34:24 -0000	1.1.1.3.4.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: useragent.c,v 1.1.1.3.4.1.2.3 2001/06/14 20:36:16 serassio Exp $
+ * $Id: useragent.c,v 1.1.1.3.4.1.2.4 2001/06/14 21:34:24 serassio Exp $
  *
  * DEBUG: section 40    User-Agent logging
  * AUTHOR: Joe Ramey <ramey@csc.ti.com>
@@ -63,7 +63,6 @@
 #if defined(_SQUID_CYGWIN_)||defined(_SQUID_MSWIN_)
     setmode(fileno(cache_useragent_log), O_TEXT);
 #endif
-
 #endif
 }
 
@@ -110,7 +109,7 @@
 void
 logUserAgent(const char *client, const char *agent)
 {
-#if USE_USERAGENT_LOG 
+#if USE_USERAGENT_LOG
     static time_t last_time = 0;
     static char time_str[128];
     const char *s;