--------------------- PatchSet 3524 Date: 2001/12/28 15:38:04 Author: serassio Branch: cygwin Tag: (none) Log: Fixed merge inconsistency with HEAD Members: src/debug.c:1.3.26.12->1.3.26.13 src/htcp.c:1.5.16.3->1.5.16.4 Index: squid/src/debug.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/debug.c,v retrieving revision 1.3.26.12 retrieving revision 1.3.26.13 diff -u -r1.3.26.12 -r1.3.26.13 --- squid/src/debug.c 28 Dec 2001 15:41:21 -0000 1.3.26.12 +++ squid/src/debug.c 28 Dec 2001 15:42:35 -0000 1.3.26.13 @@ -1,6 +1,6 @@ /* - * $Id: debug.c,v 1.3.26.12 2001/12/28 15:41:21 serassio Exp $ + * $Id: debug.c,v 1.3.26.13 2001/12/28 15:42:35 serassio Exp $ * * DEBUG: section 0 Debug Routines * AUTHOR: Harvest Derived @@ -57,9 +57,7 @@ #endif LOCAL_ARRAY(char, f, BUFSIZ); va_list args1; - #if STDC_HEADERS - va_list args2; va_list args3; #else Index: squid/src/htcp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/htcp.c,v retrieving revision 1.5.16.3 retrieving revision 1.5.16.4 diff -u -r1.5.16.3 -r1.5.16.4 --- squid/src/htcp.c 15 Dec 2001 21:37:34 -0000 1.5.16.3 +++ squid/src/htcp.c 28 Dec 2001 15:38:04 -0000 1.5.16.4 @@ -1,6 +1,6 @@ /* - * $Id: htcp.c,v 1.5.16.3 2001/12/15 21:37:34 serassio Exp $ + * $Id: htcp.c,v 1.5.16.4 2001/12/28 15:38:04 serassio Exp $ * * DEBUG: section 31 Hypertext Caching Protocol * AUTHOR: Duane Wesssels @@ -848,9 +848,9 @@ { if (Config.Port.htcp <= 0) { /* - * Need to allocate a bit of memory anyway, otherwise - * mem.c::memCheckInit() will bail out. - */ + * Need to allocate a bit of memory anyway, otherwise + * mem.c::memCheckInit() will bail out. + */ memDataInit(MEM_HTCP_SPECIFIER, "htcpSpecifier", sizeof(htcpSpecifier), 0); memDataInit(MEM_HTCP_DETAIL, "htcpDetail", sizeof(htcpDetail), 0);