------------------------------------------------------------
revno: 12341 [merge]
revision-id: kinkie@squid-cache.org-20121005072635-0w6cfh03wwbozh09
parent: squidadm@squid-cache.org-20121004002344-7n75j2lm9b38dehw
parent: kinkie@squid-cache.org-20121004111017-fka2j2s5i1xqv67j
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Fri 2012-10-05 09:26:35 +0200
message:
  SourceFormat merge: removed CVS-Id tags, removed unnecessary extern and SQUIDCEXTERN declarations
------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20121005072635-0w6cfh03wwbozh09
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 6a2ea197369ee3c1caabd56e15661ca7dadc48c9
# timestamp: 2012-10-05 07:53:03 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squidadm@squid-cache.org-20121004002344-\
#   7n75j2lm9b38dehw
# 
# Begin patch
=== modified file 'CREDITS'
--- CREDITS	2012-08-01 06:40:26 +0000
+++ CREDITS	2012-10-04 11:10:17 +0000
@@ -1,5 +1,3 @@
-$Id$
-
 ==============================================================================
 
 SQUID Internet Object Cache  http://www.squid-cache.org

=== modified file 'QUICKSTART'
--- QUICKSTART	2009-01-21 03:47:47 +0000
+++ QUICKSTART	2012-10-04 11:10:17 +0000
@@ -1,8 +1,6 @@
 
 Squid QUICKSTART
 
-$Id$
-
 This document is intended only for people who want to get Squid running
 quickly It is not a substitute for the real documentation.  Squid has
 many features, but only a few of them are useful at the beginning.  Use

=== modified file 'compat/GnuRegex.c'
--- compat/GnuRegex.c	2012-08-28 13:00:30 +0000
+++ compat/GnuRegex.c	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 /* Extended regular expression matching and search library,
  * version 0.12.
  * (Implements POSIX draft P10003.2/D11.2, except for

=== modified file 'compat/GnuRegex.h'
--- compat/GnuRegex.h	2012-08-28 13:00:30 +0000
+++ compat/GnuRegex.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_REGEXP_LIBRARY_H
 #define SQUID_REGEXP_LIBRARY_H
 

=== modified file 'compat/cpu.h'
--- compat/cpu.h	2010-11-21 04:40:05 +0000
+++ compat/cpu.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_COMPAT_CPU_H
 #define SQUID_COMPAT_CPU_H
 

=== modified file 'compat/getaddrinfo.c'
--- compat/getaddrinfo.c	2012-01-20 18:55:04 +0000
+++ compat/getaddrinfo.c	2012-10-04 11:10:17 +0000
@@ -12,8 +12,6 @@
  *
  *    06-Oct-2007 : Various fixes to allow the build on MinGW
  *
- * Squid CVS $Id$
- *
  *  Original License and code follows.
  */
 #include "squid.h"

=== modified file 'compat/getaddrinfo.h'
--- compat/getaddrinfo.h	2011-08-06 03:45:38 +0000
+++ compat/getaddrinfo.h	2012-10-04 11:10:17 +0000
@@ -13,8 +13,6 @@
  *    16-Aug-2007 : Altered configure checks
  *                  Un-hacked slightly to use system gethostbyname()
  *
- * Squid CVS $Id$
- *
  *  Original License and code follows.
  */
 

=== modified file 'compat/getnameinfo.c'
--- compat/getnameinfo.c	2012-01-20 18:55:04 +0000
+++ compat/getnameinfo.c	2012-10-04 11:10:17 +0000
@@ -14,8 +14,6 @@
  *                      - use xinet_ntop instead of inet_ntop
  *                      - use SQUIDHOSTNAMELEN instead of MAXHOSTNAMELEN
  *
- * Squid CVS $Id$
- *
  *  Original License and code follows.
  */
 #include "squid.h"

=== modified file 'compat/inet_ntop.c'
--- compat/inet_ntop.c	2012-01-20 18:55:04 +0000
+++ compat/inet_ntop.c	2012-10-04 11:10:17 +0000
@@ -16,8 +16,6 @@
  *
  *    04-Nov-2010: drop SPRINTF casting macro
  *
- * Squid CVS $Id$
- *
  *  Original License and code follows.
  */
 

=== modified file 'compat/inet_pton.c'
--- compat/inet_pton.c	2012-01-20 18:55:04 +0000
+++ compat/inet_pton.c	2012-10-04 11:10:17 +0000
@@ -13,8 +13,6 @@
  *
  *    28-Oct-2007: drop some dead code. now tested working without.
  *
- * Squid CVS $Id$
- *
  *  Original License and code follows.
  */
 

=== modified file 'compat/shm.h'
--- compat/shm.h	2012-08-28 13:00:30 +0000
+++ compat/shm.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_COMPAT_SHM_H
 #define SQUID_COMPAT_SHM_H
 

=== modified file 'compat/strnstr.cc'
--- compat/strnstr.cc	2012-07-02 12:14:07 +0000
+++ compat/strnstr.cc	2012-10-04 11:10:17 +0000
@@ -12,8 +12,6 @@
  * 			- added squid_ prefix for uniqueness
  * 			  so we can use it where OS copy is broken.
  *
- * Squid VCS $Id$
- *
  *  Original License and code follows.
  */
 

=== modified file 'compat/xstrto.cc'
--- compat/xstrto.cc	2012-01-20 18:55:04 +0000
+++ compat/xstrto.cc	2012-10-04 11:10:17 +0000
@@ -23,8 +23,6 @@
  * 			- xtables_strtoui renamed to xstrtoui
  * 			- xtables_strtoul renamed to xstrtoul
  *
- * Squid VCS $Id$
- *
  *  Original License and code follows.
  */
 

=== modified file 'configure.ac'
--- configure.ac	2012-08-30 16:32:59 +0000
+++ configure.ac	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-dnl
-dnl  $Id$
-dnl
-dnl
-dnl
 AC_INIT([Squid Web Proxy],[3.HEAD-BZR],[http://www.squid-cache.org/bugs/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])

=== modified file 'errors/Makefile.am'
--- errors/Makefile.am	2011-10-03 10:55:34 +0000
+++ errors/Makefile.am	2012-10-04 11:10:17 +0000
@@ -1,7 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-#
-# $Id$
-#
 
 errordir = $(datadir)/errors
 

=== modified file 'helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.pl.in'
--- helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.pl.in	2010-05-31 09:32:19 +0000
+++ helpers/basic_auth/MSNT-multi-domain/basic_msnt_multi_domain_auth.pl.in	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 #!@PERL@
-# $Id$
 
 #if you define this, debugging output will be printed to STDERR.
 #$debug=1;

=== modified file 'helpers/external_acl/file_userip/ext_file_userip_acl.cc'
--- helpers/external_acl/file_userip/ext_file_userip_acl.cc	2012-08-28 13:00:30 +0000
+++ helpers/external_acl/file_userip/ext_file_userip_acl.cc	2012-10-04 11:10:17 +0000
@@ -1,23 +1,23 @@
-/* $Id$
-* Copyright (C) 2002 Rodrigo Campos
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-* Author: Rodrigo Campos (rodrigo@geekbunker.org)
-*
-*/
+/*
+ * Copyright (C) 2002 Rodrigo Campos
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Author: Rodrigo Campos (rodrigo@geekbunker.org)
+ *
+ */
 #include "squid.h"
 #include "helpers/defines.h"
 #include "rfc1738.h"

=== modified file 'include/getfullhostname.h'
--- include/getfullhostname.h	2010-11-21 04:40:05 +0000
+++ include/getfullhostname.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef _SQUID_GETFULLHOSTNAME_H
 #define _SQUID_GETFULLHOSTNAME_H
 

=== modified file 'include/hash.h'
--- include/hash.h	2010-11-21 04:40:05 +0000
+++ include/hash.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_HASH_H
 #define SQUID_HASH_H
 

=== modified file 'include/memMeter.h'
--- include/memMeter.h	2010-11-21 04:40:05 +0000
+++ include/memMeter.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef _MEM_METER_H_
 #define _MEM_METER_H_
 

=== modified file 'include/parse.h'
--- include/parse.h	2009-08-23 09:30:49 +0000
+++ include/parse.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_PARSE_H
 #define SQUID_PARSE_H
 

=== modified file 'include/radix.h'
--- include/radix.h	2012-08-28 13:00:30 +0000
+++ include/radix.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_RADIX_H
 #define	SQUID_RADIX_H
 

=== modified file 'include/rfc2181.h'
--- include/rfc2181.h	2010-03-15 13:34:27 +0000
+++ include/rfc2181.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef _SQUID_INCLUDE_RFC1123_H
 #define _SQUID_INCLUDE_RFC1123_H
 

=== modified file 'include/snmp_api_util.h'
--- include/snmp_api_util.h	2010-11-21 04:40:05 +0000
+++ include/snmp_api_util.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_SNMP_API_UTIL_H
 #define SQUID_SNMP_API_UTIL_H
 

=== modified file 'include/snmp_client.h'
--- include/snmp_client.h	2009-08-23 09:30:49 +0000
+++ include/snmp_client.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SNMP_CLIENT_H
 #define SQUID_SNMP_CLIENT_H
 

=== modified file 'include/snmp_debug.h'
--- include/snmp_debug.h	2010-11-21 04:40:05 +0000
+++ include/snmp_debug.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_SNMP_DEBUG_H
 #define SQUID_SNMP_DEBUG_H
 

=== modified file 'include/snmp_impl.h'
--- include/snmp_impl.h	2011-08-02 07:31:53 +0000
+++ include/snmp_impl.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_SNMP_IMPL_H
 #define SQUID_SNMP_IMPL_H
 

=== modified file 'include/snmp_util.h'
--- include/snmp_util.h	2012-08-28 13:00:30 +0000
+++ include/snmp_util.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_SNMP_UTIL_H
 #define SQUID_SNMP_UTIL_H
 

=== modified file 'include/splay.h'
--- include/splay.h	2012-08-28 13:00:30 +0000
+++ include/splay.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SPLAY_H
 #define SQUID_SPLAY_H
 

=== modified file 'include/xusleep.h'
--- include/xusleep.h	2010-11-21 04:40:05 +0000
+++ include/xusleep.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef _INC_XUSLEEP_H
 #define _INC_XUSLEEP_H
 

=== modified file 'lib/libTrie/Makefile.am'
--- lib/libTrie/Makefile.am	2009-01-21 03:47:47 +0000
+++ lib/libTrie/Makefile.am	2012-10-04 11:10:17 +0000
@@ -1,7 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-#
-# $Id$
-#
 
 AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5
 DIST_SUBDIRS = include src test

=== modified file 'lib/md5-test.c'
--- lib/md5-test.c	2012-01-20 18:55:04 +0000
+++ lib/md5-test.c	2012-10-04 11:10:17 +0000
@@ -1,8 +1,4 @@
 /*
- * $Id$
- */
-
-/*
  * COMPILE WITH:
  *      gcc -Wall md5-test.c -I../include md5.o
  */

=== modified file 'lib/stub_memaccount.c'
--- lib/stub_memaccount.c	2012-01-20 18:55:04 +0000
+++ lib/stub_memaccount.c	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 /* Stub function for programs not implementing statMemoryAccounted */
 #include "squid.h"
 #include "util.h"

=== modified file 'lib/uudecode.c'
--- lib/uudecode.c	2012-01-20 18:55:04 +0000
+++ lib/uudecode.c	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "uudecode.h"
 

=== modified file 'scripts/check_cache.pl'
--- scripts/check_cache.pl	2009-01-21 03:47:47 +0000
+++ scripts/check_cache.pl	2012-10-04 11:10:17 +0000
@@ -8,8 +8,6 @@
 # Check the Squid-1.1.x cache directory for stale objects - i.e. those
 # which exist on disk but aren't listed in cached's log file.
 
-# $Id$
-
 require "getopts.pl";
 &Getopts("c:drt:vh");
 # -c		: the full path to squid.conf

=== modified file 'scripts/fileno-to-pathname.pl'
--- scripts/fileno-to-pathname.pl	2009-01-21 03:47:47 +0000
+++ scripts/fileno-to-pathname.pl	2012-10-04 11:10:17 +0000
@@ -1,6 +1,5 @@
 #!/usr/bin/perl -w
 
-# $Id$
 # Convert hexadecimal cache file numbers (from swap log) into full pathnames.  
 # Duane Wessels 6/30/97
 

=== modified file 'scripts/flag_truncs.pl'
--- scripts/flag_truncs.pl	2009-01-21 03:47:47 +0000
+++ scripts/flag_truncs.pl	2012-10-04 11:10:17 +0000
@@ -6,8 +6,6 @@
 # - i.e. those for which there is a "Content-length:" HTTP header,
 #   and this does not match the size of the cached object
 
-# $Id$
-
 require "getopts.pl";
 require "stat.pl";
 &Getopts("cd");

=== modified file 'scripts/split-cf.data.pre.pl'
--- scripts/split-cf.data.pre.pl	2009-01-21 03:47:47 +0000
+++ scripts/split-cf.data.pre.pl	2012-10-04 11:10:17 +0000
@@ -9,8 +9,6 @@
 # cf.data.pre and split it into separare files, one per option
 #
 # Henrik Nordstrom <henrik@henriknordstrom.net>
-#
-# $Id$
 
 #
 # The template file is reasonably simple to parse. There's a number of

=== modified file 'scripts/upgrade-1.0-store.pl'
--- scripts/upgrade-1.0-store.pl	2009-01-21 03:47:47 +0000
+++ scripts/upgrade-1.0-store.pl	2012-10-04 11:10:17 +0000
@@ -1,7 +1,5 @@
 #!/usr/local/bin/perl
 
-# $Id$
-
 select(STDERR); $|=1;
 select(STDOUT); $|=1;
 

=== modified file 'scripts/www/build-cfg-help.pl'
--- scripts/www/build-cfg-help.pl	2012-10-03 00:44:13 +0000
+++ scripts/www/build-cfg-help.pl	2012-10-04 11:10:17 +0000
@@ -9,8 +9,6 @@
 # cf.data.pre and generate a set of HTML pages to use as documentation.
 #
 # Adrian Chadd <adrian@squid-cache.org>
-#
-# $Id$
 
 #
 # The template file is reasonably simple to parse. There's a number of

=== modified file 'src/AuthReg.h'
--- src/AuthReg.h	2012-09-22 10:56:48 +0000
+++ src/AuthReg.h	2012-10-04 09:14:06 +0000
@@ -36,7 +36,7 @@
 
 #if USE_AUTH
 /// Initialize Auth subsystem
-extern void Init(void);
+void Init(void);
 #else /* USE_AUTH */
 inline void Init(void) {} /* NOP if not USE_AUTH */
 #endif /* USE_AUTH */

=== modified file 'src/CommCalls.h'
--- src/CommCalls.h	2012-08-28 13:00:30 +0000
+++ src/CommCalls.h	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-
-/*
- * $Id$
- */
-
 #ifndef SQUID_COMMCALLS_H
 #define SQUID_COMMCALLS_H
 

=== modified file 'src/CpuAffinity.h'
--- src/CpuAffinity.h	2012-09-01 14:38:36 +0000
+++ src/CpuAffinity.h	2012-10-03 17:32:57 +0000
@@ -5,12 +5,12 @@
 #define SQUID_CPU_AFFINITY_H
 
 /// set CPU affinity for this process on startup
-SQUIDCEXTERN void CpuAffinityInit();
+void CpuAffinityInit();
 
 /// reconfigure CPU affinity for this process
-SQUIDCEXTERN void CpuAffinityReconfigure();
+void CpuAffinityReconfigure();
 
 /// check CPU affinity configuration and print warnings if needed
-SQUIDCEXTERN void CpuAffinityCheck();
+void CpuAffinityCheck();
 
 #endif // SQUID_CPU_AFFINITY_H

=== modified file 'src/DiskIO/DiskThreads/aiops.cc'
--- src/DiskIO/DiskThreads/aiops.cc	2012-09-04 09:10:20 +0000
+++ src/DiskIO/DiskThreads/aiops.cc	2012-10-03 17:32:57 +0000
@@ -107,7 +107,7 @@
 
 static void squidaio_queue_request(squidaio_request_t *);
 static void squidaio_cleanup_request(squidaio_request_t *);
-SQUIDCEXTERN void *squidaio_thread_loop(void *);
+void *squidaio_thread_loop(void *);
 static void squidaio_do_open(squidaio_request_t *);
 static void squidaio_do_read(squidaio_request_t *);
 static void squidaio_do_write(squidaio_request_t *);

=== modified file 'src/FadingCounter.cc'
--- src/FadingCounter.cc	2012-08-14 11:53:07 +0000
+++ src/FadingCounter.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "base/TextException.h"
 #include "SquidTime.h"

=== modified file 'src/FadingCounter.h'
--- src/FadingCounter.h	2010-04-06 00:12:56 +0000
+++ src/FadingCounter.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_FADING_COUNTER_H
 #define SQUID_FADING_COUNTER_H
 

=== modified file 'src/HttpControlMsg.h'
--- src/HttpControlMsg.h	2010-09-11 00:12:53 +0000
+++ src/HttpControlMsg.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_HTTP_CONTROL_MSG_H
 #define SQUID_HTTP_CONTROL_MSG_H
 

=== modified file 'src/HttpHdrScTarget.cc'
--- src/HttpHdrScTarget.cc	2012-09-01 14:38:36 +0000
+++ src/HttpHdrScTarget.cc	2012-10-04 09:14:06 +0000
@@ -37,7 +37,7 @@
 #include "HttpHdrSc.h"
 #include "StatHist.h"
 
-extern http_hdr_sc_type &operator++ (http_hdr_sc_type &aHeader);
+http_hdr_sc_type &operator++ (http_hdr_sc_type &aHeader);
 /* copies non-extant fields from new_sc to this sc */
 void
 HttpHdrScTarget::mergeWith(const HttpHdrScTarget * new_sc)

=== modified file 'src/HttpMsg.h'
--- src/HttpMsg.h	2012-09-01 14:38:36 +0000
+++ src/HttpMsg.h	2012-10-03 17:32:57 +0000
@@ -130,7 +130,7 @@
 
 };
 
-SQUIDCEXTERN int httpMsgIsolateHeaders(const char **parse_start, int len, const char **blk_start, const char **blk_end);
+int httpMsgIsolateHeaders(const char **parse_start, int len, const char **blk_start, const char **blk_end);
 
 #define HTTPMSGUNLOCK(a) if(a){(a)->_unlock();(a)=NULL;}
 #define HTTPMSGLOCK(a) (a)->_lock()

=== modified file 'src/HttpRequest.h'
--- src/HttpRequest.h	2012-09-21 14:57:30 +0000
+++ src/HttpRequest.h	2012-10-04 09:14:06 +0000
@@ -56,7 +56,6 @@
 class ConnStateData;
 
 /*  Http Request */
-//DEAD?: extern int httpRequestHdrAllowedByName(http_hdr_type id);
 void httpRequestPack(void *obj, Packer *p);
 
 class HttpHdrRange;

=== modified file 'src/HttpStatusLine.h'
--- src/HttpStatusLine.h	2012-09-01 14:38:36 +0000
+++ src/HttpStatusLine.h	2012-10-03 17:32:57 +0000
@@ -62,19 +62,19 @@
 };
 
 /* init/clean */
-SQUIDCEXTERN void httpStatusLineInit(HttpStatusLine * sline);
-SQUIDCEXTERN void httpStatusLineClean(HttpStatusLine * sline);
+void httpStatusLineInit(HttpStatusLine * sline);
+void httpStatusLineClean(HttpStatusLine * sline);
 /* set/get values */
-SQUIDCEXTERN void httpStatusLineSet(HttpStatusLine * sline, HttpVersion version,
+void httpStatusLineSet(HttpStatusLine * sline, HttpVersion version,
                                     http_status status, const char *reason);
-SQUIDCEXTERN const char *httpStatusLineReason(const HttpStatusLine * sline);
+const char *httpStatusLineReason(const HttpStatusLine * sline);
 /* parse/pack */
 /* parse a 0-terminating buffer and fill internal structires; returns true on success */
-SQUIDCEXTERN int httpStatusLineParse(HttpStatusLine * sline, const String &protoPrefix,
+int httpStatusLineParse(HttpStatusLine * sline, const String &protoPrefix,
                                      const char *start, const char *end);
 /* pack fields using Packer */
-SQUIDCEXTERN void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p);
+void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p);
 
-SQUIDCEXTERN const char *httpStatusString(http_status status);
+const char *httpStatusString(http_status status);
 
 #endif /* SQUID_HTTPSTATUSLINE_H */

=== modified file 'src/MemBuf.h'
--- src/MemBuf.h	2012-09-01 14:38:36 +0000
+++ src/MemBuf.h	2012-10-03 17:32:57 +0000
@@ -173,8 +173,8 @@
 #endif
 
 /** returns free() function to be used, _freezes_ the object! */
-SQUIDCEXTERN void memBufReport(MemBuf * mb);
+void memBufReport(MemBuf * mb);
 /** pack content into a mem buf. */
-SQUIDCEXTERN void packerToMemInit(Packer * p, MemBuf * mb);
+void packerToMemInit(Packer * p, MemBuf * mb);
 
 #endif /* SQUID_MEM_H */

=== modified file 'src/MemStore.h'
--- src/MemStore.h	2012-07-13 14:33:19 +0000
+++ src/MemStore.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_MEMSTORE_H
 #define SQUID_MEMSTORE_H
 

=== modified file 'src/Packer.h'
--- src/Packer.h	2012-09-01 14:38:36 +0000
+++ src/Packer.h	2012-10-03 17:32:57 +0000
@@ -53,9 +53,8 @@
     void *real_handler;		/* first parameter to real append and vprintf */
 };
 
-SQUIDCEXTERN void packerClean(Packer * p);
-SQUIDCEXTERN void packerAppend(Packer * p, const char *buf, int size);
-SQUIDCEXTERN void
-packerPrintf(Packer * p, const char *fmt,...) PRINTF_FORMAT_ARG2;
+void packerClean(Packer * p);
+void packerAppend(Packer * p, const char *buf, int size);
+void packerPrintf(Packer * p, const char *fmt,...) PRINTF_FORMAT_ARG2;
 
 #endif /* SQUID_PACKER_H */

=== modified file 'src/PeerSelectState.h'
--- src/PeerSelectState.h	2012-09-04 14:38:44 +0000
+++ src/PeerSelectState.h	2012-10-03 17:32:57 +0000
@@ -47,8 +47,8 @@
 
 typedef void PSC(Comm::ConnectionList *, ErrorState *, void *);
 
-SQUIDCEXTERN void peerSelect(Comm::ConnectionList *, HttpRequest *, StoreEntry *, PSC *, void *data);
-SQUIDCEXTERN void peerSelectInit(void);
+void peerSelect(Comm::ConnectionList *, HttpRequest *, StoreEntry *, PSC *, void *data);
+void peerSelectInit(void);
 
 /**
  * A CachePeer which has been selected as a possible destination.

=== modified file 'src/Server.cc'
--- src/Server.cc	2012-09-04 09:10:20 +0000
+++ src/Server.cc	2012-10-04 09:14:06 +0000
@@ -57,7 +57,7 @@
 #endif
 
 // implemented in client_side_reply.cc until sides have a common parent
-extern void purgeEntriesByUrl(HttpRequest * req, const char *url);
+void purgeEntriesByUrl(HttpRequest * req, const char *url);
 
 ServerStateData::ServerStateData(FwdState *theFwdState): AsyncJob("ServerStateData"),
         requestSender(NULL),

=== modified file 'src/StoreIOState.h'
--- src/StoreIOState.h	2012-09-01 14:38:36 +0000
+++ src/StoreIOState.h	2012-10-03 17:32:57 +0000
@@ -111,8 +111,8 @@
 
 StoreIOState::Pointer storeCreate(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
 StoreIOState::Pointer storeOpen(StoreEntry *, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);
-SQUIDCEXTERN void storeClose(StoreIOState::Pointer, int how);
-SQUIDCEXTERN void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *);
-SQUIDCEXTERN void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *);
+void storeClose(StoreIOState::Pointer, int how);
+void storeRead(StoreIOState::Pointer, char *, size_t, off_t, StoreIOState::STRCB *, void *);
+void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *);
 
 #endif /* SQUID_STOREIOSTATE_H */

=== modified file 'src/StoreMeta.h'
--- src/StoreMeta.h	2012-09-01 14:38:36 +0000
+++ src/StoreMeta.h	2012-10-03 17:32:57 +0000
@@ -151,10 +151,10 @@
 };
 
 /// \ingroup SwapStoreAPI
-SQUIDCEXTERN char *storeSwapMetaPack(tlv * tlv_list, int *length);
-/// \ingroup SwapStoreAPI
-SQUIDCEXTERN tlv *storeSwapMetaBuild(StoreEntry * e);
-/// \ingroup SwapStoreAPI
-SQUIDCEXTERN void storeSwapTLVFree(tlv * n);
+char *storeSwapMetaPack(tlv * tlv_list, int *length);
+/// \ingroup SwapStoreAPI
+tlv *storeSwapMetaBuild(StoreEntry * e);
+/// \ingroup SwapStoreAPI
+void storeSwapTLVFree(tlv * n);
 
 #endif /* SQUID_TYPELENGTHVALUE_H */

=== modified file 'src/StoreMetaUnpacker.h'
--- src/StoreMetaUnpacker.h	2012-09-01 14:38:36 +0000
+++ src/StoreMetaUnpacker.h	2012-10-03 17:32:57 +0000
@@ -64,10 +64,10 @@
 /*
  * store_swapmeta.c
  */
-SQUIDCEXTERN char *storeSwapMetaPack(StoreMeta * tlv_list, int *length);
-SQUIDCEXTERN StoreMeta *storeSwapMetaBuild(StoreEntry * e);
-SQUIDCEXTERN StoreMeta *storeSwapMetaUnpack(const char *buf, int *hdrlen);
-SQUIDCEXTERN void storeSwapTLVFree(StoreMeta * n);
+char *storeSwapMetaPack(StoreMeta * tlv_list, int *length);
+StoreMeta *storeSwapMetaBuild(StoreEntry * e);
+StoreMeta *storeSwapMetaUnpack(const char *buf, int *hdrlen);
+void storeSwapTLVFree(StoreMeta * n);
 StoreMeta ** storeSwapTLVAdd(int type, const void *ptr, size_t len, StoreMeta ** tail);
 
 #endif /* SQUID_TYPELENGTHVALUEUNPACKER_H */

=== modified file 'src/String.cc'
--- src/String.cc	2012-09-22 01:28:35 +0000
+++ src/String.cc	2012-10-04 09:14:06 +0000
@@ -303,7 +303,7 @@
 
 StringRegistry StringRegistry::Instance_;
 
-extern String::size_type memStringCount();
+String::size_type memStringCount();
 
 void
 StringRegistry::Stat(StoreEntry *entry)

=== modified file 'src/acl/SslError.cc'
--- src/acl/SslError.cc	2012-08-14 11:53:07 +0000
+++ src/acl/SslError.cc	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "acl/SslError.h"
 #include "acl/SslErrorData.h"

=== modified file 'src/acl/SslError.h'
--- src/acl/SslError.h	2012-01-24 10:03:18 +0000
+++ src/acl/SslError.h	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-
-/*
- * $Id$
- */
-
 #ifndef SQUID_ACLSSL_ERROR_H
 #define SQUID_ACLSSL_ERROR_H
 #include "acl/Strategy.h"

=== modified file 'src/acl/SslErrorData.h'
--- src/acl/SslErrorData.h	2012-01-24 10:03:18 +0000
+++ src/acl/SslErrorData.h	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-
-/*
- * $Id$
- */
-
 #ifndef SQUID_ACLSSL_ERRORDATA_H
 #define SQUID_ACLSSL_ERRORDATA_H
 #include "acl/Acl.h"

=== modified file 'src/adaptation/Elements.h'
--- src/adaptation/Elements.h	2011-05-13 10:38:28 +0000
+++ src/adaptation/Elements.h	2012-10-04 09:14:06 +0000
@@ -11,8 +11,8 @@
 typedef enum { srvBlock, srvBypass, srvWait, srvForce} SrvBehaviour;
 
 extern const char *crlf;
-extern const char *methodStr(Method); // TODO: make into a stream operator?
-extern const char *vectPointStr(VectPoint); // TODO: make into a stream op?
+const char *methodStr(Method); // TODO: make into a stream operator?
+const char *vectPointStr(VectPoint); // TODO: make into a stream op?
 
 } // namespace Adaptation
 

=== modified file 'src/adaptation/Message.h'
--- src/adaptation/Message.h	2008-10-10 08:02:53 +0000
+++ src/adaptation/Message.h	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-
-/*
- * $Id$
- */
-
 #ifndef SQUID__ADAPTATION__MESSAGE_H
 #define SQUID__ADAPTATION__MESSAGE_H
 

=== modified file 'src/adaptation/Service.h'
--- src/adaptation/Service.h	2011-03-08 23:56:22 +0000
+++ src/adaptation/Service.h	2012-10-04 09:14:06 +0000
@@ -61,11 +61,11 @@
 typedef Service::Pointer ServicePointer;
 
 typedef Vector<Adaptation::ServicePointer> Services;
-extern Services &AllServices();
-extern ServicePointer FindService(const Service::Id &key);
+Services &AllServices();
+ServicePointer FindService(const Service::Id &key);
 
 /// detach all adaptation services from current configuration
-extern void DetachServices();
+void DetachServices();
 
 } // namespace Adaptation
 

=== modified file 'src/adaptation/ServiceGroups.h'
--- src/adaptation/ServiceGroups.h	2012-08-28 13:00:30 +0000
+++ src/adaptation/ServiceGroups.h	2012-10-04 09:14:06 +0000
@@ -142,8 +142,8 @@
 }
 
 typedef Vector<ServiceGroupPointer> Groups;
-extern Groups &AllGroups();
-extern ServiceGroupPointer FindGroup(const ServiceGroup::Id &id);
+Groups &AllGroups();
+ServiceGroupPointer FindGroup(const ServiceGroup::Id &id);
 
 } // namespace Adaptation
 

=== modified file 'src/adaptation/ecap/Config.cc'
--- src/adaptation/ecap/Config.cc	2012-08-28 13:00:30 +0000
+++ src/adaptation/ecap/Config.cc	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * DEBUG: section 93    eCAP Interface
  */
 #include "squid.h"

=== modified file 'src/adaptation/ecap/Config.h'
--- src/adaptation/ecap/Config.h	2012-08-28 13:00:30 +0000
+++ src/adaptation/ecap/Config.h	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * DEBUG: section 93    eCAP Interface
  */
 

=== modified file 'src/adaptation/ecap/Host.h'
--- src/adaptation/ecap/Host.h	2011-03-11 21:57:27 +0000
+++ src/adaptation/ecap/Host.h	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * DEBUG: section 93    eCAP Interface
  */
 

=== modified file 'src/adaptation/ecap/MessageRep.h'
--- src/adaptation/ecap/MessageRep.h	2012-08-28 13:00:30 +0000
+++ src/adaptation/ecap/MessageRep.h	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * DEBUG: section 93    eCAP Interface
  */
 

=== modified file 'src/adaptation/ecap/ServiceRep.h'
--- src/adaptation/ecap/ServiceRep.h	2011-03-30 18:07:38 +0000
+++ src/adaptation/ecap/ServiceRep.h	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * DEBUG: section 93    eCAP Interface
  */
 
@@ -49,15 +48,15 @@
 };
 
 /// register loaded eCAP module service
-extern void RegisterAdapterService(const ServiceRep::AdapterService& adapterService);
+void RegisterAdapterService(const ServiceRep::AdapterService& adapterService);
 /// unregister loaded eCAP module service by service uri
-extern void UnregisterAdapterService(const String& serviceUri);
+void UnregisterAdapterService(const String& serviceUri);
 
 /// returns loaded eCAP module service by service uri
-extern ServiceRep::AdapterService FindAdapterService(const String& serviceUri);
+ServiceRep::AdapterService FindAdapterService(const String& serviceUri);
 
 /// check for loaded eCAP services without matching ecap_service in squid.conf
-extern void CheckUnusedAdapterServices(const Services& services);
+void CheckUnusedAdapterServices(const Services& services);
 } // namespace Ecap
 } // namespace Adaptation
 

=== modified file 'src/adaptation/ecap/XactionRep.h'
--- src/adaptation/ecap/XactionRep.h	2011-10-28 19:43:45 +0000
+++ src/adaptation/ecap/XactionRep.h	2012-10-04 11:10:17 +0000
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * DEBUG: section 93    eCAP Interface
  */
 

=== modified file 'src/base/AsyncCall.cc'
--- src/base/AsyncCall.cc	2012-09-20 11:28:21 +0000
+++ src/base/AsyncCall.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "AsyncCall.h"
 #include "base/AsyncCall.h"

=== modified file 'src/base/AsyncCall.h'
--- src/base/AsyncCall.h	2012-09-21 14:57:30 +0000
+++ src/base/AsyncCall.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_ASYNCCALL_H
 #define SQUID_ASYNCCALL_H
 

=== modified file 'src/base/AsyncJob.h'
--- src/base/AsyncJob.h	2010-10-04 14:52:38 +0000
+++ src/base/AsyncJob.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_ASYNC_JOB_H
 #define SQUID_ASYNC_JOB_H
 

=== modified file 'src/base/AsyncJobCalls.h'
--- src/base/AsyncJobCalls.h	2012-08-28 13:00:30 +0000
+++ src/base/AsyncJobCalls.h	2012-10-04 11:10:17 +0000
@@ -1,8 +1,3 @@
-
-/*
- * $Id$
- */
-
 #ifndef SQUID_ASYNCJOBCALLS_H
 #define SQUID_ASYNCJOBCALLS_H
 

=== modified file 'src/base/CbcPointer.h'
--- src/base/CbcPointer.h	2012-08-28 13:00:30 +0000
+++ src/base/CbcPointer.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_CBC_POINTER_H
 #define SQUID_CBC_POINTER_H
 

=== modified file 'src/base/TidyPointer.h'
--- src/base/TidyPointer.h	2010-12-06 14:11:46 +0000
+++ src/base/TidyPointer.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_BASE_TIDYPOINTER_H
 #define SQUID_BASE_TIDYPOINTER_H
 

=== modified file 'src/clientStream.h'
--- src/clientStream.h	2012-09-01 14:38:36 +0000
+++ src/clientStream.h	2012-10-03 17:32:57 +0000
@@ -136,13 +136,13 @@
 };
 
 /// \ingroup ClientStreamAPI
-SQUIDCEXTERN void clientStreamInit(dlink_list *, CSR *, CSD *, CSS *, ClientStreamData, CSCB *, CSD *, ClientStreamData, StoreIOBuffer tailBuffer);
-
-/// \ingroup ClientStreamAPI
-SQUIDCEXTERN void clientStreamInsertHead(dlink_list *, CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
-
-/// \ingroup ClientStreamAPI
-SQUIDCEXTERN clientStreamNode *clientStreamNew(CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
+void clientStreamInit(dlink_list *, CSR *, CSD *, CSS *, ClientStreamData, CSCB *, CSD *, ClientStreamData, StoreIOBuffer tailBuffer);
+
+/// \ingroup ClientStreamAPI
+void clientStreamInsertHead(dlink_list *, CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
+
+/// \ingroup ClientStreamAPI
+clientStreamNode *clientStreamNew(CSR *, CSCB *, CSD *, CSS *, ClientStreamData);
 
 /**
  \ingroup ClientStreamAPI
@@ -157,7 +157,7 @@
  			Each node may alter the reply if appropriate.
  \param replyBuffer	- buffer, length - where and how much.
  */
-SQUIDCEXTERN void clientStreamCallback(clientStreamNode *thisObject, ClientHttpRequest *http, HttpReply *rep, StoreIOBuffer replyBuffer);
+void clientStreamCallback(clientStreamNode *thisObject, ClientHttpRequest *http, HttpReply *rep, StoreIOBuffer replyBuffer);
 
 /**
  \ingroup ClientStreamAPI
@@ -170,7 +170,7 @@
  \param http		Superset of request data, being winnowed down over time. MUST NOT be NULL.
  \param readBuffer	- offset, length, buffer - what, how much and where.
  */
-SQUIDCEXTERN void clientStreamRead(clientStreamNode *thisObject, ClientHttpRequest *http, StoreIOBuffer readBuffer);
+void clientStreamRead(clientStreamNode *thisObject, ClientHttpRequest *http, StoreIOBuffer readBuffer);
 
 /**
  \ingroup ClientStreamAPI
@@ -182,7 +182,7 @@
  \param thisObject	'this' reference for the client stream
  \param http		MUST NOT be NULL.
  */
-SQUIDCEXTERN void clientStreamDetach(clientStreamNode *thisObject, ClientHttpRequest *http);
+void clientStreamDetach(clientStreamNode *thisObject, ClientHttpRequest *http);
 
 /**
  \ingroup ClientStreamAPI
@@ -193,7 +193,7 @@
  \param thisObject	'this' reference for the client stream
  \param http		MUST NOT be NULL.
  */
-SQUIDCEXTERN void clientStreamAbort(clientStreamNode *thisObject, ClientHttpRequest *http);
+void clientStreamAbort(clientStreamNode *thisObject, ClientHttpRequest *http);
 
 /**
  \ingroup ClientStreamAPI
@@ -207,6 +207,6 @@
  \param thisObject	'this' reference for the client stream
  \param http		MUST NOT be NULL.
  */
-SQUIDCEXTERN clientStream_status_t clientStreamStatus(clientStreamNode *thisObject, ClientHttpRequest *http);
+clientStream_status_t clientStreamStatus(clientStreamNode *thisObject, ClientHttpRequest *http);
 
 #endif /* SQUID_CLIENTSTREAM_H */

=== modified file 'src/client_side.cc'
--- src/client_side.cc	2012-10-04 00:23:44 +0000
+++ src/client_side.cc	2012-10-05 07:26:35 +0000
@@ -1896,9 +1896,9 @@
     }
 }
 
-extern "C" CSR clientGetMoreData;
-extern "C" CSS clientReplyStatus;
-extern "C" CSD clientReplyDetach;
+SQUIDCEXTERN CSR clientGetMoreData;
+SQUIDCEXTERN CSS clientReplyStatus;
+SQUIDCEXTERN CSD clientReplyDetach;
 
 static ClientSocketContext *
 parseHttpRequestAbort(ConnStateData * csd, const char *uri)

=== modified file 'src/client_side_reply.cc'
--- src/client_side_reply.cc	2012-09-19 17:16:56 +0000
+++ src/client_side_reply.cc	2012-10-04 09:14:06 +0000
@@ -76,7 +76,7 @@
 
 /* Local functions */
 extern "C" CSS clientReplyStatus;
-extern ErrorState *clientBuildError(err_type, http_status, char const *, Ip::Address &, HttpRequest *);
+ErrorState *clientBuildError(err_type, http_status, char const *, Ip::Address &, HttpRequest *);
 
 /* privates */
 
@@ -433,8 +433,8 @@
     }
 }
 
-extern "C" CSR clientGetMoreData;
-extern "C" CSD clientReplyDetach;
+SQUIDCEXTERN CSR clientGetMoreData;
+SQUIDCEXTERN CSD clientReplyDetach;
 
 /**
  * clientReplyContext::cacheHit Should only be called until the HTTP reply headers

=== modified file 'src/client_side_request.cc'
--- src/client_side_request.cc	2012-09-19 17:16:56 +0000
+++ src/client_side_request.cc	2012-10-04 09:14:06 +0000
@@ -101,7 +101,7 @@
 static void clientFollowXForwardedForCheck(allow_t answer, void *data);
 #endif /* FOLLOW_X_FORWARDED_FOR */
 
-extern ErrorState *clientBuildError(err_type, http_status, char const *url, Ip::Address &, HttpRequest *);
+ErrorState *clientBuildError(err_type, http_status, char const *url, Ip::Address &, HttpRequest *);
 
 CBDATA_CLASS_INIT(ClientRequestContext);
 
@@ -131,9 +131,9 @@
 static void clientInterpretRequestHeaders(ClientHttpRequest * http);
 static RH clientRedirectDoneWrapper;
 static void checkNoCacheDoneWrapper(allow_t, void *);
-extern "C" CSR clientGetMoreData;
-extern "C" CSS clientReplyStatus;
-extern "C" CSD clientReplyDetach;
+SQUIDCEXTERN CSR clientGetMoreData;
+SQUIDCEXTERN CSS clientReplyStatus;
+SQUIDCEXTERN CSD clientReplyDetach;
 static void checkFailureRatio(err_type, hier_code);
 
 ClientRequestContext::~ClientRequestContext()
@@ -1533,8 +1533,8 @@
  * the callout.  This is strictly for convenience.
  */
 
-extern tos_t aclMapTOS (acl_tos * head, ACLChecklist * ch);
-extern nfmark_t aclMapNfmark (acl_nfmark * head, ACLChecklist * ch);
+tos_t aclMapTOS (acl_tos * head, ACLChecklist * ch);
+nfmark_t aclMapNfmark (acl_nfmark * head, ACLChecklist * ch);
 
 void
 ClientHttpRequest::doCallouts()

=== modified file 'src/debug.cc'
--- src/debug.cc	2012-09-01 14:38:36 +0000
+++ src/debug.cc	2012-10-03 17:32:57 +0000
@@ -63,7 +63,7 @@
 static void _db_print_file(const char *format, va_list args);
 
 #if _SQUID_MSWIN_
-SQUIDCEXTERN LPCRITICAL_SECTION dbg_mutex;
+extern LPCRITICAL_SECTION dbg_mutex;
 typedef BOOL (WINAPI * PFInitializeCriticalSectionAndSpinCount) (LPCRITICAL_SECTION, DWORD);
 #endif
 

=== modified file 'src/dlink.cc'
--- src/dlink.cc	2012-08-28 13:00:30 +0000
+++ src/dlink.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #include "squid.h"
 #include "dlink.h"
 

=== modified file 'src/errorpage.h'
--- src/errorpage.h	2012-09-20 11:28:21 +0000
+++ src/errorpage.h	2012-10-03 17:32:57 +0000
@@ -203,10 +203,10 @@
  \par Global effects:
  *            error_text[] - is modified
  */
-SQUIDCEXTERN void errorInitialize(void);
+void errorInitialize(void);
 
 /// \ingroup ErrorPageAPI
-SQUIDCEXTERN void errorClean(void);
+void errorClean(void);
 
 /**
  * \ingroup ErrorPageAPI
@@ -228,7 +228,7 @@
  \param clientConn  socket where page object is to be written
  \param err         This object is destroyed after use in this function.
  */
-SQUIDCEXTERN void errorSend(const Comm::ConnectionPointer &conn, ErrorState *err);
+void errorSend(const Comm::ConnectionPointer &conn, ErrorState *err);
 
 /**
  \ingroup ErrorPageAPI
@@ -246,12 +246,12 @@
  \param entry   ??
  \param err     This object is destroyed after use in this function.
  */
-SQUIDCEXTERN void errorAppendEntry(StoreEntry *entry, ErrorState *err);
+void errorAppendEntry(StoreEntry *entry, ErrorState *err);
 
 /// \ingroup ErrorPageAPI
-SQUIDCEXTERN err_type errorReservePageId(const char *page_name);
+err_type errorReservePageId(const char *page_name);
 
-SQUIDCEXTERN const char *errorPageName(int pageId); ///< error ID to string
+const char *errorPageName(int pageId); ///< error ID to string
 
 /**
  \ingroup ErrorPageAPI

=== modified file 'src/esi/Esi.cc'
--- src/esi/Esi.cc	2012-09-04 09:10:20 +0000
+++ src/esi/Esi.cc	2012-10-04 09:14:06 +0000
@@ -1448,7 +1448,7 @@
     /* don't touch incoming, it's a pointer into buffered anyway */
 }
 
-extern ErrorState *clientBuildError (err_type, http_status, char const *, Ip::Address &, HttpRequest *);
+ErrorState *clientBuildError (err_type, http_status, char const *, Ip::Address &, HttpRequest *);
 
 /* This can ONLY be used before we have sent *any* data to the client */
 void

=== modified file 'src/fde.h'
--- src/fde.h	2012-10-04 00:23:44 +0000
+++ src/fde.h	2012-10-05 07:26:35 +0000
@@ -52,6 +52,7 @@
     dwrite_q *write_q;
     dwrite_q *write_q_tail;
     off_t offset;
+    _fde_disk() { memset(this, 0, sizeof(_fde_disk)); }
 };
 
 class fde
@@ -113,7 +114,7 @@
 #endif
     unsigned epoll_state;
 
-    struct _fde_disk disk;
+    _fde_disk disk;
     PF *read_handler;
     void *read_data;
     PF *write_handler;
@@ -167,7 +168,6 @@
         clientInfo = NULL;
 #endif
         epoll_state = 0;
-        memset(&disk, 0, sizeof(_fde_disk));
         read_handler = NULL;
         read_data = NULL;
         write_handler = NULL;
@@ -193,7 +193,7 @@
     }
 };
 
-SQUIDCEXTERN int fdNFree(void);
+int fdNFree(void);
 
 #define FD_READ_METHOD(fd, buf, len) (*fd_table[fd].read_method)(fd, buf, len)
 #define FD_WRITE_METHOD(fd, buf, len) (*fd_table[fd].write_method)(fd, buf, len)

=== modified file 'src/fqdncache.h'
--- src/fqdncache.h	2012-09-21 14:57:30 +0000
+++ src/fqdncache.h	2012-10-04 09:14:06 +0000
@@ -41,15 +41,12 @@
 
 void fqdncache_init(void);
 void fqdnStats(StoreEntry *);
-//extern void fqdncacheReleaseInvalid(const char *);
-//extern int fqdncacheQueueDrain(void);
 void fqdncacheFreeMemory(void);
 void fqdncache_restart(void);
 void fqdncache_purgelru(void *);
 void fqdncacheAddEntryFromHosts(char *addr, wordlist * hostnames);
 
 const char *fqdncache_gethostbyaddr(const Ip::Address &, int flags);
-//extern const char *fqdnFromAddr(const Ip::Address &);
 void fqdncache_nbgethostbyaddr(const Ip::Address &, FQDNH *, void *);
 
 #endif /* SQUID_FQDNCACHE_H_ */

=== modified file 'src/fs/coss/coss-notes.txt'
--- src/fs/coss/coss-notes.txt	2009-01-21 03:47:47 +0000
+++ src/fs/coss/coss-notes.txt	2012-10-04 11:10:17 +0000
@@ -10,9 +10,6 @@
 
 Adrian Chadd <adrian@creative.net.au>
 
-$Id$
-
-
 COSS is a Cyclic Object storage system originally designed by
 Eric Stern <estern@logisense.com>. The idea has been extended
 and worked into the current framework by myself.

=== modified file 'src/fs/coss/store_dir_coss.cc'
--- src/fs/coss/store_dir_coss.cc	2012-09-06 14:22:03 +0000
+++ src/fs/coss/store_dir_coss.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,4 @@
 /*
- * $Id$
- * vim: set et :
- *
  * DEBUG: section 47    Store COSS Directory Routines
  * AUTHOR: Eric Stern
  *

=== modified file 'src/helper.h'
--- src/helper.h	2012-10-02 01:55:36 +0000
+++ src/helper.h	2012-10-03 17:32:57 +0000
@@ -199,15 +199,15 @@
 MEMPROXY_CLASS_INLINE(helper_stateful_request);
 
 /* helper.c */
-SQUIDCEXTERN void helperOpenServers(helper * hlp);
-SQUIDCEXTERN void helperStatefulOpenServers(statefulhelper * hlp);
-SQUIDCEXTERN void helperSubmit(helper * hlp, const char *buf, HLPCB * callback, void *data);
-SQUIDCEXTERN void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPSCB * callback, void *data, helper_stateful_server * lastserver);
-SQUIDCEXTERN void helperStats(StoreEntry * sentry, helper * hlp, const char *label = NULL);
-SQUIDCEXTERN void helperStatefulStats(StoreEntry * sentry, statefulhelper * hlp, const char *label = NULL);
-SQUIDCEXTERN void helperShutdown(helper * hlp);
-SQUIDCEXTERN void helperStatefulShutdown(statefulhelper * hlp);
-SQUIDCEXTERN void helperStatefulReleaseServer(helper_stateful_server * srv);
-SQUIDCEXTERN void *helperStatefulServerGetData(helper_stateful_server * srv);
+void helperOpenServers(helper * hlp);
+void helperStatefulOpenServers(statefulhelper * hlp);
+void helperSubmit(helper * hlp, const char *buf, HLPCB * callback, void *data);
+void helperStatefulSubmit(statefulhelper * hlp, const char *buf, HLPSCB * callback, void *data, helper_stateful_server * lastserver);
+void helperStats(StoreEntry * sentry, helper * hlp, const char *label = NULL);
+void helperStatefulStats(StoreEntry * sentry, statefulhelper * hlp, const char *label = NULL);
+void helperShutdown(helper * hlp);
+void helperStatefulShutdown(statefulhelper * hlp);
+void helperStatefulReleaseServer(helper_stateful_server * srv);
+void *helperStatefulServerGetData(helper_stateful_server * srv);
 
 #endif /* SQUID_HELPER_H */

=== modified file 'src/icmp/Icmp4.h'
--- src/icmp/Icmp4.h	2012-09-01 14:38:36 +0000
+++ src/icmp/Icmp4.h	2012-10-03 17:32:57 +0000
@@ -168,7 +168,7 @@
 #if USE_ICMP
 
 /// pinger helper contains one of these as a global object.
-SQUIDCEXTERN Icmp4 icmp4;
+extern Icmp4 icmp4;
 
 #endif /* USE_ICMP && SQUID_HELPER */
 

=== modified file 'src/icmp/Icmp6.h'
--- src/icmp/Icmp6.h	2010-11-21 04:40:05 +0000
+++ src/icmp/Icmp6.h	2012-10-03 17:32:57 +0000
@@ -80,7 +80,7 @@
 #if USE_ICMP
 
 /// pinger helper contains one of these as a global object.
-SQUIDCEXTERN Icmp6 icmp6;
+extern Icmp6 icmp6;
 
 #endif /* USE_ICMP && SQUID_HELPER */
 #endif /* _INCLUDE_ICMPV6_H */

=== modified file 'src/icmp/IcmpPinger.h'
--- src/icmp/IcmpPinger.h	2012-09-01 14:38:36 +0000
+++ src/icmp/IcmpPinger.h	2012-10-03 17:32:57 +0000
@@ -72,7 +72,7 @@
 #if USE_ICMP
 
 /// pinger helper contains one of these as a global object.
-SQUIDCEXTERN IcmpPinger control;
+extern IcmpPinger control;
 
 #endif
 

=== modified file 'src/icmp/IcmpSquid.h'
--- src/icmp/IcmpSquid.h	2010-11-21 04:40:05 +0000
+++ src/icmp/IcmpSquid.h	2012-10-03 17:32:57 +0000
@@ -60,6 +60,6 @@
 };
 
 // global engine within squid.
-SQUIDCEXTERN IcmpSquid icmpEngine;
+extern IcmpSquid icmpEngine;
 
 #endif /* _INCLUDE_ICMPSQUID_H */

=== modified file 'src/ident/Ident.h'
--- src/ident/Ident.h	2010-11-27 14:02:42 +0000
+++ src/ident/Ident.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_IDENT_H
 #define SQUID_IDENT_H
 

=== modified file 'src/ip/Address.h'
--- src/ip/Address.h	2012-08-28 13:00:30 +0000
+++ src/ip/Address.h	2012-10-04 09:14:06 +0000
@@ -402,6 +402,6 @@
 
 } // namespace Ip
 
-extern void parse_IpAddress_list_token(Ip::Address_list **, char *);
+void parse_IpAddress_list_token(Ip::Address_list **, char *);
 
 #endif /* _SQUID_IP_IPADDRESS_H */

=== modified file 'src/ip/tools.h'
--- src/ip/tools.h	2010-11-27 01:58:38 +0000
+++ src/ip/tools.h	2012-10-04 09:14:06 +0000
@@ -5,7 +5,7 @@
 {
 
 /// Probe to discover IPv6 capabilities
-extern void ProbeTransport(void);
+void ProbeTransport(void);
 
 /* Squids notion of IPv6 stack types and state */
 #define IPV6_OFF  0

=== modified file 'src/ipc/FdNotes.h'
--- src/ipc/FdNotes.h	2012-09-01 14:38:36 +0000
+++ src/ipc/FdNotes.h	2012-10-04 09:14:06 +0000
@@ -19,7 +19,7 @@
                fdnInIcpSocket, fdnInHtcpSocket, fdnEnd
              } FdNoteId;
 
-extern const char *FdNote(int fdNodeId); ///< converts FdNoteId into a string
+const char *FdNote(int fdNodeId); ///< converts FdNoteId into a string
 
 } // namespace Ipc;
 

=== modified file 'src/ipc/SharedListen.h'
--- src/ipc/SharedListen.h	2012-09-01 14:38:36 +0000
+++ src/ipc/SharedListen.h	2012-10-04 09:14:06 +0000
@@ -69,10 +69,10 @@
 };
 
 /// prepare and send SharedListenRequest to Coordinator
-extern void JoinSharedListen(const OpenListenerParams &, AsyncCall::Pointer &);
+void JoinSharedListen(const OpenListenerParams &, AsyncCall::Pointer &);
 
 /// process Coordinator response to SharedListenRequest
-extern void SharedListenJoined(const SharedListenResponse &response);
+void SharedListenJoined(const SharedListenResponse &response);
 
 } // namespace Ipc;
 

=== modified file 'src/ipc/StartListening.h'
--- src/ipc/StartListening.h	2012-09-01 14:38:36 +0000
+++ src/ipc/StartListening.h	2012-10-04 09:14:06 +0000
@@ -37,7 +37,7 @@
 
 /// Depending on whether SMP is on, either ask Coordinator to send us
 /// the listening FD or open a listening socket directly.
-extern void StartListening(int sock_type, int proto, const Comm::ConnectionPointer &listenConn,
+void StartListening(int sock_type, int proto, const Comm::ConnectionPointer &listenConn,
                            FdNoteId fdNote, AsyncCall::Pointer &callback);
 
 } // namespace Ipc;

=== modified file 'src/ipc/UdsOp.h'
--- src/ipc/UdsOp.h	2012-09-01 14:38:36 +0000
+++ src/ipc/UdsOp.h	2012-10-04 09:14:06 +0000
@@ -55,7 +55,7 @@
 };
 
 /// converts human-readable filename path into UDS address
-extern struct sockaddr_un PathToAddress(const String &pathAddr);
+struct sockaddr_un PathToAddress(const String &pathAddr);
 
 // XXX: move UdsSender code to UdsSender.{cc,h}
 /// attempts to send an IPC message a few times, with a timeout

=== modified file 'src/log/File.h'
--- src/log/File.h	2010-11-21 04:40:05 +0000
+++ src/log/File.h	2012-10-04 09:14:06 +0000
@@ -50,13 +50,13 @@
 };
 
 /* Legacy API */
-extern Logfile *logfileOpen(const char *path, size_t bufsz, int);
-extern void logfileClose(Logfile * lf);
-extern void logfileRotate(Logfile * lf);
-extern void logfileWrite(Logfile * lf, char *buf, size_t len);
-extern void logfileFlush(Logfile * lf);
-extern void logfilePrintf(Logfile * lf, const char *fmt,...) PRINTF_FORMAT_ARG2;
-extern void logfileLineStart(Logfile * lf);
-extern void logfileLineEnd(Logfile * lf);
+Logfile *logfileOpen(const char *path, size_t bufsz, int);
+void logfileClose(Logfile * lf);
+void logfileRotate(Logfile * lf);
+void logfileWrite(Logfile * lf, char *buf, size_t len);
+void logfileFlush(Logfile * lf);
+void logfilePrintf(Logfile * lf, const char *fmt,...) PRINTF_FORMAT_ARG2;
+void logfileLineStart(Logfile * lf);
+void logfileLineEnd(Logfile * lf);
 
 #endif /* SQUID_SRC_LOG_FILE_H */

=== modified file 'src/log/ModDaemon.h'
--- src/log/ModDaemon.h	2010-11-21 04:40:05 +0000
+++ src/log/ModDaemon.h	2012-10-04 09:14:06 +0000
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_daemon_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_daemon_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODDAEMON_H */

=== modified file 'src/log/ModStdio.h'
--- src/log/ModStdio.h	2012-09-01 14:38:36 +0000
+++ src/log/ModStdio.h	2012-10-04 09:14:06 +0000
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_stdio_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_stdio_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODSTDIO_H */

=== modified file 'src/log/ModSyslog.h'
--- src/log/ModSyslog.h	2012-09-01 14:38:36 +0000
+++ src/log/ModSyslog.h	2012-10-04 09:14:06 +0000
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_syslog_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_syslog_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODSYSLOG_H */

=== modified file 'src/log/ModTcp.h'
--- src/log/ModTcp.h	2012-09-01 14:38:36 +0000
+++ src/log/ModTcp.h	2012-10-04 09:14:06 +0000
@@ -35,6 +35,6 @@
 
 class Logfile;
 
-extern int logfile_mod_tcp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_tcp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODTCP_H */

=== modified file 'src/log/ModUdp.h'
--- src/log/ModUdp.h	2012-09-01 14:38:36 +0000
+++ src/log/ModUdp.h	2012-10-04 09:14:06 +0000
@@ -34,6 +34,6 @@
 
 class Logfile;
 
-extern int logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
+int logfile_mod_udp_open(Logfile * lf, const char *path, size_t bufsz, int fatal_flag);
 
 #endif /* _SQUID_SRC_LOG_MODUDP_H */

=== modified file 'src/log/access_log.h'
--- src/log/access_log.h	2012-08-29 00:12:28 +0000
+++ src/log/access_log.h	2012-10-04 09:14:06 +0000
@@ -33,13 +33,13 @@
 #ifndef SQUID_LOG_ACCESS_LOG_H_
 #define SQUID_LOG_ACCESS_LOG_H_
 
-extern int logTypeIsATcpHit(log_type);
-extern void fvdbCountVia(const char *key);
-extern void fvdbCountForw(const char *key);
+int logTypeIsATcpHit(log_type);
+void fvdbCountVia(const char *key);
+void fvdbCountForw(const char *key);
 
 #if HEADERS_LOG
 class HttpRequestMethod;
-extern void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data);
+void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data);
 #endif
 
 #endif /* SQUID_LOG_ACCESS_LOG_H_ */

=== modified file 'src/main.cc'
--- src/main.cc	2012-09-04 09:10:20 +0000
+++ src/main.cc	2012-10-04 09:14:06 +0000
@@ -160,7 +160,7 @@
 static int opt_remove_service = FALSE;
 static int opt_signal_service = FALSE;
 static int opt_command_line = FALSE;
-extern void WIN32_svcstatusupdate(DWORD, DWORD);
+void WIN32_svcstatusupdate(DWORD, DWORD);
 void WINAPI WIN32_svcHandler(DWORD);
 
 #endif
@@ -196,8 +196,8 @@
 static void watch_child(char **);
 static void setEffectiveUser(void);
 #if MEM_GEN_TRACE
-extern void log_trace_done();
-extern void log_trace_init(char *);
+void log_trace_done();
+void log_trace_init(char *);
 #endif
 static void SquidShutdown(void);
 static void mainSetCwd(void);

=== modified file 'src/mem.cc'
--- src/mem.cc	2012-09-25 15:36:18 +0000
+++ src/mem.cc	2012-10-04 09:14:06 +0000
@@ -257,7 +257,6 @@
     return pool ? pool->alloc() : xcalloc(1, net_size);
 }
 
-extern size_t memStringCount();
 size_t
 memStringCount()
 {

=== modified file 'src/mgr/CountersAction.cc'
--- src/mgr/CountersAction.cc	2012-09-01 14:38:36 +0000
+++ src/mgr/CountersAction.cc	2012-10-04 09:14:06 +0000
@@ -12,8 +12,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetCountersStats(Mgr::CountersActionData& stats);
-extern void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry);
+void GetCountersStats(Mgr::CountersActionData& stats);
+void DumpCountersStats(Mgr::CountersActionData& stats, StoreEntry* sentry);
 
 Mgr::CountersActionData::CountersActionData()
 {

=== modified file 'src/mgr/InfoAction.cc'
--- src/mgr/InfoAction.cc	2012-09-01 14:38:36 +0000
+++ src/mgr/InfoAction.cc	2012-10-04 09:14:06 +0000
@@ -19,9 +19,9 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetInfo(Mgr::InfoActionData& stats);
-extern void DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry);
-extern void DumpMallocStatistics(StoreEntry* sentry);
+void GetInfo(Mgr::InfoActionData& stats);
+void DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry);
+void DumpMallocStatistics(StoreEntry* sentry);
 
 Mgr::InfoActionData::InfoActionData()
 {

=== modified file 'src/mgr/IntervalAction.cc'
--- src/mgr/IntervalAction.cc	2012-09-01 14:38:36 +0000
+++ src/mgr/IntervalAction.cc	2012-10-04 09:14:06 +0000
@@ -12,8 +12,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours);
-extern void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry);
+void GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours);
+void DumpAvgStat(Mgr::IntervalActionData& stats, StoreEntry* sentry);
 
 Mgr::IntervalActionData::IntervalActionData()
 {

=== modified file 'src/mgr/IoAction.cc'
--- src/mgr/IoAction.cc	2012-09-17 15:12:01 +0000
+++ src/mgr/IoAction.cc	2012-10-04 09:14:06 +0000
@@ -13,8 +13,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetIoStats(Mgr::IoActionData& stats);
-extern void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry);
+void GetIoStats(Mgr::IoActionData& stats);
+void DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry);
 
 Mgr::IoActionData::IoActionData()
 {

=== modified file 'src/mgr/ServiceTimesAction.cc'
--- src/mgr/ServiceTimesAction.cc	2012-09-01 14:38:36 +0000
+++ src/mgr/ServiceTimesAction.cc	2012-10-04 09:14:06 +0000
@@ -11,8 +11,8 @@
 #include "Store.h"
 #include "tools.h"
 
-extern void GetServiceTimesStats(Mgr::ServiceTimesActionData& stats);
-extern void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentry);
+void GetServiceTimesStats(Mgr::ServiceTimesActionData& stats);
+void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentry);
 
 Mgr::ServiceTimesActionData::ServiceTimesActionData()
 {

=== modified file 'src/mib.txt'
--- src/mib.txt	2010-01-14 09:18:00 +0000
+++ src/mib.txt	2012-10-04 11:10:17 +0000
@@ -1,9 +1,6 @@
 -- SQUID-MIB  { iso org(3) dod(6) internet(1) private(4) enterprises(1) 3495 }
 
 SQUID-MIB DEFINITIONS ::= BEGIN
---
--- $Id$
---
 
 IMPORTS
 	enterprises, Unsigned32, TimeTicks, Gauge32, Counter32,

=== modified file 'src/mk-string-arrays.pl'
--- src/mk-string-arrays.pl	2009-01-21 03:47:47 +0000
+++ src/mk-string-arrays.pl	2012-10-04 11:10:17 +0000
@@ -1,6 +1,4 @@
 #******************************************************************************
-# $Id$
-#
 # File:		mk-strs.pl
 #
 # Author:	Max Okumoto <okumoto@ucsd.edu>

=== modified file 'src/pconn.h'
--- src/pconn.h	2012-08-28 13:00:30 +0000
+++ src/pconn.h	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #ifndef SQUID_PCONN_H
 #define SQUID_PCONN_H
 

=== modified file 'src/repl/Makefile.am'
--- src/repl/Makefile.am	2010-08-20 16:15:46 +0000
+++ src/repl/Makefile.am	2012-10-04 11:10:17 +0000
@@ -1,7 +1,4 @@
 #  Makefile for storage modules in the Squid Object Cache server
-#
-#  $Id$
-#
 
 include $(top_srcdir)/src/Common.am
 

=== modified file 'src/repl/heap/store_heap_replacement.h'
--- src/repl/heap/store_heap_replacement.h	2008-03-20 11:30:19 +0000
+++ src/repl/heap/store_heap_replacement.h	2012-10-04 09:14:06 +0000
@@ -1,13 +1,10 @@
-/*
- * $Id$
- */
 #ifndef _SQUIDINC_STORE_HEAP_REPLACEMENT_H
 #define _SQUIDINC_STORE_HEAP_REPLACEMENT_H
 
 #include "heap.h"
 
-extern heap_key HeapKeyGen_StoreEntry_LFUDA(void *entry, double age);
-extern heap_key HeapKeyGen_StoreEntry_GDSF(void *entry, double age);
-extern heap_key HeapKeyGen_StoreEntry_LRU(void *entry, double age);
+heap_key HeapKeyGen_StoreEntry_LFUDA(void *entry, double age);
+heap_key HeapKeyGen_StoreEntry_GDSF(void *entry, double age);
+heap_key HeapKeyGen_StoreEntry_LRU(void *entry, double age);
 
 #endif /* _SQUIDINC_STORE_HEAP_REPLACEMENT_H */

=== modified file 'src/snmp/Forwarder.h'
--- src/snmp/Forwarder.h	2012-09-01 14:38:36 +0000
+++ src/snmp/Forwarder.h	2012-10-04 09:14:06 +0000
@@ -42,7 +42,7 @@
     CBDATA_CLASS2(Forwarder);
 };
 
-extern void SendResponse(unsigned int requestId, const Pdu& pdu);
+void SendResponse(unsigned int requestId, const Pdu& pdu);
 
 } // namespace Snmp
 

=== modified file 'src/snmp/Response.h'
--- src/snmp/Response.h	2012-09-01 14:38:36 +0000
+++ src/snmp/Response.h	2012-10-04 09:14:06 +0000
@@ -31,7 +31,7 @@
     Pdu pdu; ///< SNMP protocol data unit
 };
 
-extern std::ostream& operator << (std::ostream& os, const Response& response);
+std::ostream& operator << (std::ostream& os, const Response& response);
 
 } // namespace Snmp
 

=== modified file 'src/ssl/Config.cc'
--- src/ssl/Config.cc	2012-01-20 18:55:04 +0000
+++ src/ssl/Config.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #include "squid.h"
 #include "ssl/Config.h"
 

=== modified file 'src/ssl/Config.h'
--- src/ssl/Config.h	2010-11-21 04:40:05 +0000
+++ src/ssl/Config.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SSL_CONFIG_H
 #define SQUID_SSL_CONFIG_H
 

=== modified file 'src/ssl/certificate_db.cc'
--- src/ssl/certificate_db.cc	2012-08-28 13:00:30 +0000
+++ src/ssl/certificate_db.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "ssl/certificate_db.h"
 #if HAVE_ERRNO_H

=== modified file 'src/ssl/certificate_db.h'
--- src/ssl/certificate_db.h	2012-03-27 16:52:31 +0000
+++ src/ssl/certificate_db.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SSL_CERTIFICATE_DB_H
 #define SQUID_SSL_CERTIFICATE_DB_H
 

=== modified file 'src/ssl/context_storage.cc'
--- src/ssl/context_storage.cc	2012-09-04 15:15:51 +0000
+++ src/ssl/context_storage.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #include "squid.h"
 #include "Store.h"
 #include "StoreEntryStream.h"

=== modified file 'src/ssl/context_storage.h'
--- src/ssl/context_storage.h	2012-09-22 20:07:31 +0000
+++ src/ssl/context_storage.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SSL_CONTEXT_STORAGE_H
 #define SQUID_SSL_CONTEXT_STORAGE_H
 

=== modified file 'src/ssl/crtd_message.cc'
--- src/ssl/crtd_message.cc	2012-08-28 13:00:30 +0000
+++ src/ssl/crtd_message.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "ssl/gadgets.h"
 #include "ssl/crtd_message.h"

=== modified file 'src/ssl/crtd_message.h'
--- src/ssl/crtd_message.h	2012-06-19 21:51:49 +0000
+++ src/ssl/crtd_message.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SSL_CRTD_MESSAGE_H
 #define SQUID_SSL_CRTD_MESSAGE_H
 

=== modified file 'src/ssl/gadgets.cc'
--- src/ssl/gadgets.cc	2012-08-28 13:00:30 +0000
+++ src/ssl/gadgets.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "ssl/gadgets.h"
 #if HAVE_OPENSSL_X509V3_H

=== modified file 'src/ssl/helper.h'
--- src/ssl/helper.h	2010-11-18 08:01:53 +0000
+++ src/ssl/helper.h	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #ifndef SQUID_SSL_HELPER_H
 #define SQUID_SSL_HELPER_H
 

=== modified file 'src/ssl/ssl_crtd.cc'
--- src/ssl/ssl_crtd.cc	2012-07-23 07:02:06 +0000
+++ src/ssl/ssl_crtd.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 #include "squid.h"
 #include "helpers/defines.h"
 #include "ssl/gadgets.h"

=== modified file 'src/stat.cc'
--- src/stat.cc	2012-09-17 15:12:01 +0000
+++ src/stat.cc	2012-10-04 09:14:06 +0000
@@ -1936,7 +1936,7 @@
                                tvSubDsec(CountHist[minutes].timestamp, CountHist[0].timestamp));
 }
 
-extern double
+double
 statRequestHitRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1946,7 +1946,7 @@
                                CountHist[minutes].client_http.requests);
 }
 
-extern double
+double
 statRequestHitMemoryRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1956,7 +1956,7 @@
                                CountHist[minutes].client_http.hits);
 }
 
-extern double
+double
 statRequestHitDiskRatio(int minutes)
 {
     assert(minutes < N_COUNT_HIST);
@@ -1966,7 +1966,7 @@
                                CountHist[minutes].client_http.hits);
 }
 
-extern double
+double
 statByteHitRatio(int minutes)
 {
     size_t s;

=== modified file 'src/tests/stub_store.cc'
--- src/tests/stub_store.cc	2012-09-20 16:36:22 +0000
+++ src/tests/stub_store.cc	2012-10-04 09:14:06 +0000
@@ -116,7 +116,7 @@
 StoreEntry *storeGetPublic(const char *uri, const HttpRequestMethod& method) STUB_RETVAL(NULL)
 StoreEntry *storeGetPublicByRequest(HttpRequest * request) STUB_RETVAL(NULL)
 StoreEntry *storeGetPublicByRequestMethod(HttpRequest * request, const HttpRequestMethod& method) STUB_RETVAL(NULL)
-extern StoreEntry *storeCreateEntry(const char *, const char *, const RequestFlags &, const HttpRequestMethod&) STUB_RETVAL(NULL)
+StoreEntry *storeCreateEntry(const char *, const char *, const RequestFlags &, const HttpRequestMethod&) STUB_RETVAL(NULL)
 void storeInit(void) STUB
 void storeConfigure(void) STUB
 void storeFreeMemory(void) STUB

=== modified file 'src/tests/test_http_range.cc'
--- src/tests/test_http_range.cc	2012-09-01 14:38:36 +0000
+++ src/tests/test_http_range.cc	2012-10-03 17:32:57 +0000
@@ -47,30 +47,30 @@
 #include "acl/Checklist.h"
 #endif
 
-SQUIDCEXTERN void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str)
+void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str)
 {
     fatal ("dummy function\n");
 }
 
-SQUIDCEXTERN HttpHeaderEntry *httpHeaderGetEntry(const HttpHeader * hdr, HttpHeaderPos * pos)
+HttpHeaderEntry *httpHeaderGetEntry(const HttpHeader * hdr, HttpHeaderPos * pos)
 {
     fatal ("dummy function\n");
     return NULL;
 }
 
-extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id)
+String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id)
 {
     fatal ("dummy function\n");
     return String();
 }
 
-SQUIDCEXTERN int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type)
+int httpHeaderHas(const HttpHeader * hdr, http_hdr_type type)
 {
     fatal ("dummy function\n");
     return 0;
 }
 
-SQUIDCEXTERN void httpHeaderPutContRange(HttpHeader * hdr, const HttpHdrContRange * cr)
+void httpHeaderPutContRange(HttpHeader * hdr, const HttpHdrContRange * cr)
 {
     fatal ("dummy function\n");
 }

=== modified file 'src/tools.cc'
--- src/tools.cc	2012-09-04 09:10:20 +0000
+++ src/tools.cc	2012-10-04 09:14:06 +0000
@@ -82,8 +82,8 @@
 static void fatalvf(const char *fmt, va_list args);
 static void mail_warranty(void);
 #if MEM_GEN_TRACE
-extern void log_trace_done();
-extern void log_trace_init(char *);
+void log_trace_done();
+void log_trace_init(char *);
 #endif
 static void restoreCapabilities(int keep);
 int DebugSignal = -1;

=== modified file 'src/tunnel.cc'
--- src/tunnel.cc	2012-09-22 14:21:59 +0000
+++ src/tunnel.cc	2012-10-04 09:14:06 +0000
@@ -623,8 +623,8 @@
     commSetConnTimeout(conn, Config.Timeout.read, timeoutCall);
 }
 
-extern tos_t GetTosToServer(HttpRequest * request);
-extern nfmark_t GetNfmarkToServer(HttpRequest * request);
+tos_t GetTosToServer(HttpRequest * request);
+nfmark_t GetNfmarkToServer(HttpRequest * request);
 
 void
 tunnelStart(ClientHttpRequest * http, int64_t * size_ptr, int *status_ptr)

=== modified file 'test-suite/tcp-banger2.c'
--- test-suite/tcp-banger2.c	2012-08-28 13:00:30 +0000
+++ test-suite/tcp-banger2.c	2012-10-04 11:10:17 +0000
@@ -1,7 +1,5 @@
 #include "squid.h"
 
-/* $Id$
-
 /*
  * On some systems, FD_SETSIZE is set to something lower than the
  * actual number of files which can be opened.  IRIX is one case,

=== modified file 'test-suite/test_tools.cc'
--- test-suite/test_tools.cc	2012-08-15 15:17:32 +0000
+++ test-suite/test_tools.cc	2012-10-04 11:10:17 +0000
@@ -1,7 +1,3 @@
-/*
- * $Id$
- */
-
 // XXX: This file is made of large pieces of src/tools.cc
 // with only a few minor modifications. TODO: redesign or delete.
 

=== modified file 'tools/purge/README'
--- tools/purge/README	2010-08-20 02:38:28 +0000
+++ tools/purge/README	2012-10-04 11:10:17 +0000
@@ -70,7 +70,6 @@
 modes of operation
 ==================
 
-$Id$
 Usage:  purge   [-a] [-c cf] [-d l] [-(f|F) fn | -(e|E) re] [-p h[:p]]
                 [-P #] [-s] [-v] [-C dir [-H]] [-n]
 

=== modified file 'tools/purge/conffile.cc'
--- tools/purge/conffile.cc	2012-07-19 13:49:54 +0000
+++ tools/purge/conffile.cc	2012-10-04 11:10:17 +0000
@@ -1,8 +1,5 @@
 #include "squid.h"
 
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    conffile.cc

=== modified file 'tools/purge/conffile.hh'
--- tools/purge/conffile.hh	2012-08-14 11:53:07 +0000
+++ tools/purge/conffile.hh	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    conffile.hh

=== modified file 'tools/purge/convert.cc'
--- tools/purge/convert.cc	2012-01-20 18:55:04 +0000
+++ tools/purge/convert.cc	2012-10-04 11:10:17 +0000
@@ -1,8 +1,5 @@
 #include "squid.h"
 
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    convert.cc

=== modified file 'tools/purge/convert.hh'
--- tools/purge/convert.hh	2010-08-24 10:35:03 +0000
+++ tools/purge/convert.hh	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    convert.hh

=== modified file 'tools/purge/copyout.cc'
--- tools/purge/copyout.cc	2012-07-20 12:44:39 +0000
+++ tools/purge/copyout.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    copyout.cc

=== modified file 'tools/purge/copyout.hh'
--- tools/purge/copyout.hh	2010-08-24 10:35:03 +0000
+++ tools/purge/copyout.hh	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    copyout.hh

=== modified file 'tools/purge/purge.cc'
--- tools/purge/purge.cc	2012-08-15 00:13:13 +0000
+++ tools/purge/purge.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    purge.cc
@@ -149,7 +146,6 @@
 static bool envelope = false;
 static bool no_fork  = false;
 static const char* programname = 0;
-static const char* RCS_ID = "$Id$";
 
 // ----------------------------------------------------------------------
 
@@ -574,9 +570,9 @@
 helpMe( void )
 // purpuse: write help message and exit
 {
-    printf( "\n%s\nUsage:\t%s\t[-a] [-c cf] [-d l] [-(f|F) fn | -(e|E) re] "
+    printf( "\nUsage:\t%s\t[-a] [-c cf] [-d l] [-(f|F) fn | -(e|E) re] "
             "[-p h[:p]]\n\t\t[-P #] [-s] [-v] [-C dir [-H]] [-n]\n\n",
-            ::RCS_ID, ::programname );
+            ::programname );
     printf(
         " -a\tdisplay a little rotating thingy to indicate that I am alive (tty only).\n"
         " -c c\tsquid.conf location, default \"%s\".\n"
@@ -757,8 +753,8 @@
 
     // show results
     if ( showme ) {
-        printf( "#\n# Currently active values for %s:\n# %s\n",
-                ::programname, ::RCS_ID );
+        printf( "#\n# Currently active values for %s:\n",
+                ::programname);
         printf( "# Debug level       : " );
         if ( ::debugFlag ) printf( "%#6.4x", ::debugFlag );
         else printf( "production level" ); // printf omits 0x prefix for 0!

=== modified file 'tools/purge/signal.cc'
--- tools/purge/signal.cc	2012-01-20 18:55:04 +0000
+++ tools/purge/signal.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:   Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 // File:     signal.cc
 // Date:     Sat Feb 28 1998

=== modified file 'tools/purge/signal.hh'
--- tools/purge/signal.hh	2012-01-20 18:55:04 +0000
+++ tools/purge/signal.hh	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:   Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 // File:     signal.hh
 // Date:     Sat Feb 28 1998

=== modified file 'tools/purge/socket.cc'
--- tools/purge/socket.cc	2012-08-28 13:00:30 +0000
+++ tools/purge/socket.cc	2012-10-04 11:10:17 +0000
@@ -1,8 +1,4 @@
 #include "squid.h"
-
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    socket.hh

=== modified file 'tools/purge/socket.hh'
--- tools/purge/socket.hh	2012-08-14 11:53:07 +0000
+++ tools/purge/socket.hh	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    socket.hh

=== modified file 'tools/purge/squid-tlv.cc'
--- tools/purge/squid-tlv.cc	2012-01-20 18:55:04 +0000
+++ tools/purge/squid-tlv.cc	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    squid-tlv.cc

=== modified file 'tools/purge/squid-tlv.hh'
--- tools/purge/squid-tlv.hh	2011-10-30 02:42:27 +0000
+++ tools/purge/squid-tlv.hh	2012-10-04 11:10:17 +0000
@@ -1,6 +1,3 @@
-//
-// $Id$
-//
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    squid-tlv.hh