--------------------- PatchSet 5161 Date: 2002/09/28 14:27:50 Author: serassio Branch: nt-2_5 Tag: (none) Log: Merge of minor changes from nt branch Members: port/win32/include/autoconf.h:1.1.2.21->1.1.2.22 port/win32/squid/buildver.h:1.1.2.16->1.1.2.17 src/dns_internal.c:1.15.14.3->1.15.14.4 src/helper.c:1.16.10.14->1.16.10.15 src/icmp.c:1.4.74.6->1.4.74.7 src/ipc.c:1.7.10.7->1.7.10.8 Index: squid/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -u -r1.1.2.21 -r1.1.2.22 --- squid/port/win32/include/autoconf.h 25 Sep 2002 19:22:11 -0000 1.1.2.21 +++ squid/port/win32/include/autoconf.h 28 Sep 2002 14:27:50 -0000 1.1.2.22 @@ -22,7 +22,7 @@ * */ -/* $Id: autoconf.h,v 1.1.2.21 2002/09/25 19:22:11 serassio Exp $ */ +/* $Id: autoconf.h,v 1.1.2.22 2002/09/28 14:27:50 serassio Exp $ */ /* * configure command line used to configure Squid @@ -70,7 +70,6 @@ /* Defines how many threads aufs uses for I/O */ #undef AUFS_IO_THREADS -#define AUFS_IO_THREADS 16 /* * If you want to use Squid's ICMP features (highly recommended!) then Index: squid/port/win32/squid/buildver.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/buildver.h,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -r1.1.2.16 -r1.1.2.17 --- squid/port/win32/squid/buildver.h 25 Sep 2002 19:22:11 -0000 1.1.2.16 +++ squid/port/win32/squid/buildver.h 28 Sep 2002 14:27:50 -0000 1.1.2.17 @@ -1,4 +1,4 @@ -#define FILEVER 2,5,1,0 -#define PRODUCTVER 2,5,1,0 -#define STRFILEVER "2, 5, 1, 0\0" -#define STRPRODUCTVER "2, 5, 1, 0\0" +#define FILEVER 2,5,1,2 +#define PRODUCTVER 2,5,1,2 +#define STRFILEVER "2, 5, 1, 2\0" +#define STRPRODUCTVER "2, 5, 1, 2\0" Index: squid/src/dns_internal.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/dns_internal.c,v retrieving revision 1.15.14.3 retrieving revision 1.15.14.4 diff -u -r1.15.14.3 -r1.15.14.4 --- squid/src/dns_internal.c 23 Jun 2002 16:13:31 -0000 1.15.14.3 +++ squid/src/dns_internal.c 28 Sep 2002 14:27:50 -0000 1.15.14.4 @@ -1,6 +1,6 @@ /* - * $Id: dns_internal.c,v 1.15.14.3 2002/06/23 16:13:31 serassio Exp $ + * $Id: dns_internal.c,v 1.15.14.4 2002/09/28 14:27:50 serassio Exp $ * * DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c * AUTHOR: Duane Wessels @@ -84,7 +84,9 @@ static void idnsAddNameserver(const char *buf); static void idnsFreeNameservers(void); static void idnsParseNameservers(void); +#ifndef _SQUID_MSWIN_ static void idnsParseResolvConf(void); +#endif #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) static void idnsParseWIN32Registry(void); #endif @@ -149,6 +151,7 @@ } } +#ifndef _SQUID_MSWIN_ static void idnsParseResolvConf(void) { @@ -160,7 +163,7 @@ debug(78, 1) ("%s: %s\n", _PATH_RESOLV_CONF, xstrerror()); return; } -#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) +#if defined(_SQUID_CYGWIN_) setmode(fileno(fp), O_TEXT); #endif while (fgets(buf, 512, fp)) { @@ -177,6 +180,7 @@ } fclose(fp); } +#endif #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) static void Index: squid/src/helper.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/helper.c,v retrieving revision 1.16.10.14 retrieving revision 1.16.10.15 diff -u -r1.16.10.14 -r1.16.10.15 --- squid/src/helper.c 8 Sep 2002 08:00:55 -0000 1.16.10.14 +++ squid/src/helper.c 28 Sep 2002 14:27:51 -0000 1.16.10.15 @@ -1,6 +1,6 @@ /* - * $Id: helper.c,v 1.16.10.14 2002/09/08 08:00:55 serassio Exp $ + * $Id: helper.c,v 1.16.10.15 2002/09/28 14:27:51 serassio Exp $ * * DEBUG: section 84 Helper process maintenance * AUTHOR: Harvest Derived? @@ -579,7 +579,7 @@ getCurrentTime(); debug(34, 1) ("helperShutdown: WARNING: %s #%d (%s,%ld) " "didn't exit in 5 seconds\n", - hlp->id_name, no, hlp->cmdline->key, pid); + hlp->id_name, no, hlp->cmdline->key, (long int)pid); } CloseHandle(hIpc); } @@ -643,7 +643,7 @@ getCurrentTime(); debug(34, 1) ("helperShutdown: WARNING: %s #%d (%s,%ld) " "didn't exit in 5 seconds\n", - hlp->id_name, no, hlp->cmdline->key, pid); + hlp->id_name, no, hlp->cmdline->key, (long int)pid); } CloseHandle(hIpc); } Index: squid/src/icmp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/icmp.c,v retrieving revision 1.4.74.6 retrieving revision 1.4.74.7 diff -u -r1.4.74.6 -r1.4.74.7 --- squid/src/icmp.c 22 Jul 2002 16:52:57 -0000 1.4.74.6 +++ squid/src/icmp.c 28 Sep 2002 14:27:51 -0000 1.4.74.7 @@ -1,6 +1,6 @@ /* - * $Id: icmp.c,v 1.4.74.6 2002/07/22 16:52:57 serassio Exp $ + * $Id: icmp.c,v 1.4.74.7 2002/09/28 14:27:51 serassio Exp $ * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels @@ -251,7 +251,7 @@ getCurrentTime(); debug(34, 1) ("icmpClose: WARNING: (pinger,%ld) didn't exit in 12 seconds\n", - pid); + (long int)pid); } CloseHandle(hIpc); } Index: squid/src/ipc.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ipc.c,v retrieving revision 1.7.10.7 retrieving revision 1.7.10.8 diff -u -r1.7.10.7 -r1.7.10.8 --- squid/src/ipc.c 22 Sep 2002 11:38:05 -0000 1.7.10.7 +++ squid/src/ipc.c 28 Sep 2002 14:27:51 -0000 1.7.10.8 @@ -1,6 +1,6 @@ /* - * $Id: ipc.c,v 1.7.10.7 2002/09/22 11:38:05 serassio Exp $ + * $Id: ipc.c,v 1.7.10.8 2002/09/28 14:27:51 serassio Exp $ * * DEBUG: section 54 Interprocess Communication * AUTHOR: Duane Wessels @@ -511,7 +511,7 @@ } if (type == IPC_UDP_SOCKET) { - snprintf(buf1, 8192, "%s(%ld) <-> ipc CHILD socket", prog, -1); + snprintf(buf1, 8192, "%s(%ld) <-> ipc CHILD socket", prog, -1L); crfd_ipc = cwfd_ipc = comm_open(SOCK_DGRAM, IPPROTO_UDP, local_addr, 0, 0, buf1); if (crfd_ipc < 0) { @@ -522,7 +522,7 @@ goto cleanup; } - snprintf(buf1, 8192, "%s(%ld) <-> ipc PARENT socket", prog, -1); + snprintf(buf1, 8192, "%s(%ld) <-> ipc PARENT socket", prog, -1L); prfd_ipc = pwfd_ipc = comm_open(SOCK_DGRAM, IPPROTO_UDP, local_addr, 0, 0, buf1); if (pwfd_ipc < 0) { debug(54, @@ -689,12 +689,12 @@ assert((size_t) x == strlen(ok_string) && !strncmp(ok_string, buf1 + 200, strlen(ok_string))); } /* IPC_UDP_SOCKET */ - snprintf(buf1, 8191, "%s(%ld) CHILD socket", prog, pid); + snprintf(buf1, 8191, "%s(%ld) CHILD socket", prog, (long int)pid); fd_note(fd, buf1); if (prfd_ipc != -1) { - snprintf(buf1, 8191, "%s(%ld) <-> ipc CHILD socket", prog, pid); + snprintf(buf1, 8191, "%s(%ld) <-> ipc CHILD socket", prog, (long int)pid); fd_note(crfd_ipc, buf1); - snprintf(buf1, 8191, "%s(%ld) <-> ipc PARENT socket", prog, pid); + snprintf(buf1, 8191, "%s(%ld) <-> ipc PARENT socket", prog, (long int)pid); fd_note(prfd_ipc, buf1); } /* else { // IPC_TCP_SOCKET * commSetNoLinger(fd); @@ -716,11 +716,11 @@ goto cleanup; } - snprintf(buf1, 8191, "%ld\n", pid); + snprintf(buf1, 8191, "%ld\n", (long int)pid); if (-1 == ipcSend(cwfd, buf1, strlen(buf1))) goto cleanup; - debug(54, 2) ("ipc(%s,%d): started successfully\n", prog, pid); + debug(54, 2) ("ipc(%s,%ld): started successfully\n", prog, (long int)pid); /* cycle */ for (;;) { x = recv(crfd, buf1, 8192, 0);