Policy: Include config.h first in all .cc

Also fixes a few unsafe function uses hidden by earlier lack of these
includes safety checks.

diff --git a/compat/debug.cc b/compat/debug.cc
index a008677e6a07e84f7567712ea76795e6a5b20812..c60d88b8b9b45cec8758defeeef5f88fdd732159 100644 (file)
--- a/compat/debug.cc
+++ b/compat/debug.cc
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "compat/debug.h"
 
 /* default off */

diff --git a/compat/drand48.c b/compat/drand48.c
index febb86bada86839b1a86219ce1cd9c7809f62759..704a0a6fe40cce997cc208ea7eed8d7cced49152 100644 (file)
--- a/compat/drand48.c
+++ b/compat/drand48.c
@@ -1,4 +1,4 @@
-
+#include "config.h"
 
 /* borrowed from libc/misc/drand48.c in Linux libc-5.4.46 this quick
  * hack by Martin Hamilton <martinh@gnu.org> to make Squid build on

diff --git a/contrib/rredir.c b/contrib/rredir.c
index 5ce5041a90e1154dc80745e1fba7183d6f0a0f1a..9650e0a662d4902183acb17f0b227bdae996528d 100644 (file)
--- a/contrib/rredir.c
+++ b/contrib/rredir.c
@@ -1,4 +1,4 @@
-/* $Id$
+#include "config.h"
 
 /*
  * From:    richard@hekkihek.hacom.nl (Richard Huveneers)

diff --git a/helpers/basic_auth/MSNT/allowusers.cc b/helpers/basic_auth/MSNT/allowusers.cc
index d16f75f56c48f76509ee0e4b0652ccdc78867dc2..e6783080b0cb9ba6a7efcfdf5b600954e53943a3 100644 (file)
--- a/helpers/basic_auth/MSNT/allowusers.cc
+++ b/helpers/basic_auth/MSNT/allowusers.cc
@@ -1,3 +1,4 @@
+#include "config.h"
 
 /*
  * allowusers.c

diff --git a/helpers/basic_auth/MSNT/denyusers.cc b/helpers/basic_auth/MSNT/denyusers.cc
index 1f91860fc1e748adef7654d35240a5c73a1cda94..4bf86cbe71e9b60fd9555691ffd9f4b7caa85cf0 100644 (file)
--- a/helpers/basic_auth/MSNT/denyusers.cc
+++ b/helpers/basic_auth/MSNT/denyusers.cc
@@ -1,3 +1,4 @@
+#include "config.h"
 
 /*
  * denyusers.c

diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc
index ab9f04dc72b69a1933104ababa26973e8158382e..a213f3b8902fd9305f36393ffec1dde09e83483e 100644 (file)
--- a/helpers/basic_auth/MSNT/msntauth.cc
+++ b/helpers/basic_auth/MSNT/msntauth.cc
@@ -1,4 +1,3 @@
-
 /*
  * MSNT - Microsoft Windows NT domain squid authenticator module
  * Version 2.0 by Stellar-X Pty Ltd, Antonino Iannella
@@ -30,7 +29,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+#include "config.h"
 #include "rfc1738.h"
 #include "util.h"
 

diff --git a/helpers/basic_auth/NIS/nis_support.cc b/helpers/basic_auth/NIS/nis_support.cc
index 34137d18c24710918fe13dc523de21008bbe1540..9f33d83a5ec01657b2a23ff61449b569fc840c2c 100644 (file)
--- a/helpers/basic_auth/NIS/nis_support.cc
+++ b/helpers/basic_auth/NIS/nis_support.cc
@@ -1,7 +1,7 @@
 /*
  * Written By Rabellino Sergio (rabellino@di.unito.it) For Solaris 2.x
  */
-
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/helpers/basic_auth/RADIUS/radius-util.cc b/helpers/basic_auth/RADIUS/radius-util.cc
index bcc28f8d8b6b434ead529e812b79380280013cb4..5a4ba44bf7704f02a1007a55501b302a2acdeac8 100644 (file)
--- a/helpers/basic_auth/RADIUS/radius-util.cc
+++ b/helpers/basic_auth/RADIUS/radius-util.cc
@@ -36,7 +36,7 @@ char util_sccsid[] =
     "@(#)util.c        1.5 Copyright 1992 Livingston Enterprises Inc\n"
     "          2.1 Copyright 1997 Cistron Internet Services B.V.";
 
-#include       "config.h"
+#include "config.h"
 
 #if HAVE_SYS_SOCKET_H
 #include       <sys/socket.h>

diff --git a/helpers/negotiate_auth/kerberos/base64.cc b/helpers/negotiate_auth/kerberos/base64.cc
index 32c2b8c8739ec1edd32d7c583bc6a74dd262d97f..38e7bc0f81879a57201411c4f71b460cc4a2cb7e 100644 (file)
--- a/helpers/negotiate_auth/kerberos/base64.cc
+++ b/helpers/negotiate_auth/kerberos/base64.cc
@@ -2,10 +2,11 @@
  * Markus Moeller has modified the following code from Squid
  */
 
+#include "config.h"
+#include "base64.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "base64.h"
 
 
 static void ska_base64_init(void);

diff --git a/lib/dirent.c b/lib/dirent.c
index e5516e36296b5ec9058fcc1add198e268c3ad5f1..df96de8928d7cf614ee5ae7d8e93dcaf52662759 100644 (file)
--- a/lib/dirent.c
+++ b/lib/dirent.c
@@ -48,10 +48,12 @@
  *
  */
 
-#include "util.h"
+#include "config.h"
 
 /* The following code section is part of the native Windows Squid port */
 #if defined(_SQUID_MSWIN_)
+
+#include "util.h"
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>

diff --git a/lib/encrypt.c b/lib/encrypt.c
index f90c4e5b123abffac80fc4ba81deb2b59affb17b..2746bf2e046dc9cbe37a105fa5fb766ca3da86cb 100644 (file)
--- a/lib/encrypt.c
+++ b/lib/encrypt.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /* encrypt.c - providing 56 bit DES encryption
  * Copyright (C) 1991 Jochen Obalek
  *

diff --git a/lib/getfullhostname.c b/lib/getfullhostname.c
index 792f02bde412e7b2fc80010c2678f092e228fa25..3a8915cf3995f8d5a50f813ca4016146d336f36c 100644 (file)
--- a/lib/getfullhostname.c
+++ b/lib/getfullhostname.c
@@ -31,6 +31,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
+#include "config.h"
 #include "getfullhostname.h"
 
 

diff --git a/lib/getopt.c b/lib/getopt.c
index 1574e4d79f16b44059d0e4983b6713f618198684..6500e6d9e8d3a529aa041f617a9272072198c254 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /*
  * Copyright (c) 1987, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.

diff --git a/lib/libTrie/src/Trie.cc b/lib/libTrie/src/Trie.cc
index 01e1b191425c690e8c4c89db7d91a41a4e323a04..5a93709de6c396631f11f78cdc457314c5fb7a02 100644 (file)
--- a/lib/libTrie/src/Trie.cc
+++ b/lib/libTrie/src/Trie.cc
@@ -17,6 +17,7 @@
  *
  */
 
+#include "config.h"
 #include "Trie.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/lib/libTrie/src/TrieNode.cc b/lib/libTrie/src/TrieNode.cc
index 81dc5e8328876d3d61a64d188abf70ed41ef1cf7..458589d80895ad0da409eb28fe246863d80d1a8b 100644 (file)
--- a/lib/libTrie/src/TrieNode.cc
+++ b/lib/libTrie/src/TrieNode.cc
@@ -17,6 +17,7 @@
  *
  */
 
+#include "config.h"
 #include "TrieNode.h"
 #include "TrieCharTransform.h"
 #if HAVE_UNISTD_H

diff --git a/lib/libTrie/test/trie-c.c b/lib/libTrie/test/trie-c.c
index 649fb2e20caf4e515798e8f50a93a4fabd4f9ecb..0f77a7d664a10f56f9a66593255070110665c7f2 100644 (file)
--- a/lib/libTrie/test/trie-c.c
+++ b/lib/libTrie/test/trie-c.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include "config.h"
 #include "Trie.h"
 #include <stdio.h>
 

diff --git a/lib/libTrie/test/trie.cc b/lib/libTrie/test/trie.cc
index 468f6a2897b46df0f8a153adfa7fc18cf5f5ede6..9f8a2b3ae10a9d5349116e8fd89e499abbb9438e 100644 (file)
--- a/lib/libTrie/test/trie.cc
+++ b/lib/libTrie/test/trie.cc
@@ -17,6 +17,7 @@
  *
  */
 
+#include "config.h"
 #include "Trie.h"
 #include "TrieCharTransform.h"
 

diff --git a/lib/smblib/md4.c b/lib/smblib/md4.c
index ac9d9bd39c88fd94e4c056b193d28001c3a93d40..27e466806878e5c32de1d5271961e077b790a142 100644 (file)
--- a/lib/smblib/md4.c
+++ b/lib/smblib/md4.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /*
  * Unix SMB/Netbios implementation.
  * Version 1.9.

diff --git a/lib/smblib/smb-errors.c b/lib/smblib/smb-errors.c
index 0c0d94c91f021e559c8a67e8d7e559f50bf91132..c48ee3195c5e124445c464af07d78b467c29ede7 100644 (file)
--- a/lib/smblib/smb-errors.c
+++ b/lib/smblib/smb-errors.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /* UNIX SMBlib NetBIOS implementation
 
    Version 1.0

diff --git a/lib/smblib/smbdes.c b/lib/smblib/smbdes.c
index c2d0255ddf8852299517fcf4a2ae1386ca2149c5..e5b8b30b2cee05b36968f132d2a6d56f5ec9c354 100644 (file)
--- a/lib/smblib/smbdes.c
+++ b/lib/smblib/smbdes.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /*
  * Unix SMB/Netbios implementation.
  * Version 1.9.

diff --git a/lib/sspwin32.c b/lib/sspwin32.c
index 0cb0a3767578430a6e182f4d806e295df00da84b..ea657eb2e126ed5656763a7f51a97f278a15b849 100644 (file)
--- a/lib/sspwin32.c
+++ b/lib/sspwin32.c
@@ -33,6 +33,7 @@
  *
  */
 
+#include "config.h"
 #include "util.h"
 
 #include "libntlmauth/ntlmauth.h"

diff --git a/lib/tests/testMain.cc b/lib/tests/testMain.cc
index b3288e7acd14527490200f5aa194f338c3ad1826..08902d88fb976f05967d477bc84d6833f8ea149e 100644 (file)
--- a/lib/tests/testMain.cc
+++ b/lib/tests/testMain.cc
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include <cppunit/BriefTestProgressListener.h>
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>

diff --git a/lib/win32lib.c b/lib/win32lib.c
index 69af1de0d6c556d03618021bde5f6201630add2d..41ad5b78cda3bd01b2ebb0912ac15239aa8ab2fc 100644 (file)
--- a/lib/win32lib.c
+++ b/lib/win32lib.c
@@ -34,6 +34,7 @@
  *
  */
 
+#include "config.h"
 #include "util.h"
 
 /* The following code section is part of an EXPERIMENTAL native */

diff --git a/src/AsyncEngine.cc b/src/AsyncEngine.cc
index 8401e9b45907fcb5394ab1de830f7c102cbf3352..affe914be210dcfc30f2236d242691b120652f44 100644 (file)
--- a/src/AsyncEngine.cc
+++ b/src/AsyncEngine.cc
@@ -31,4 +31,5 @@
  *
  */
 
+#include "config.h"
 #include "AsyncEngine.h"

diff --git a/src/CompletionDispatcher.cc b/src/CompletionDispatcher.cc
index d02c68e7da3115ffa9cb24c4bff402f6e4c3ace6..e52ca5b0d0ed453b00f969f16f7a215b18faebf1 100644 (file)
--- a/src/CompletionDispatcher.cc
+++ b/src/CompletionDispatcher.cc
@@ -31,4 +31,5 @@
  *
  */
 
+#include "config.h"
 #include "CompletionDispatcher.h"

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 2453344c55a27eefe8ba3443cf272be718269034..9a7511af5d7982b1456c6cb4e6ae0143133ca532 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -33,6 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
+#include "config.h"
 #include "ConfigParser.h"
 #include "globals.h"
 

diff --git a/src/DescriptorSet.cc b/src/DescriptorSet.cc
index ed3ec30fbd18b16c5016165435e551895170698d..f6fa19abc9ab44207e2a0a391c2a199f9688e435 100644 (file)
--- a/src/DescriptorSet.cc
+++ b/src/DescriptorSet.cc
@@ -3,7 +3,7 @@
  *
  * DEBUG: section 05    Comm
  */
-
+#include "config.h"
 #include "DescriptorSet.h"
 
 // pre-allocates descriptor store and index for Squid_MaxFD descriptors

diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index d14d8fa53115d97a38a0e7586bbe130a4f7ff2eb..eb7a4104c8f15f0cfdfe667e0964d63bbb0a3d5b 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -32,7 +32,7 @@
  *
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
-
+#include "config.h"
 #include "BlockingFile.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"

diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc
index eb873b1ef69d13e9c4d296378fab5c86c92a75ba..9a619734ef8c4695570ac71bdbcc4080fd0f5fb5 100644 (file)
--- a/src/DiskIO/Blocking/BlockingIOStrategy.cc
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc
@@ -34,8 +34,10 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
+#include "config.h"
 #include "BlockingIOStrategy.h"
 #include "BlockingFile.h"
+
 bool
 BlockingIOStrategy::shedLoad()
 {

diff --git a/src/DiskIO/Blocking/DiskIOBlocking.cc b/src/DiskIO/Blocking/DiskIOBlocking.cc
index a1976ec23e4d44e5e9f5f0e4aa2188d4f7825dc8..489a500cfb485c738b62165e536a7ab8cbcb914d 100644 (file)
--- a/src/DiskIO/Blocking/DiskIOBlocking.cc
+++ b/src/DiskIO/Blocking/DiskIOBlocking.cc
@@ -30,3 +30,5 @@
  *
  * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
+
+#include "config.h"

diff --git a/src/DiskIO/ReadRequest.cc b/src/DiskIO/ReadRequest.cc
index 353e20dbf347d4f7e90cf4e4724b0a160d79127a..91eaf59ebb9a0501bfc5ce3aa27663e1746cd51e 100644 (file)
--- a/src/DiskIO/ReadRequest.cc
+++ b/src/DiskIO/ReadRequest.cc
@@ -31,6 +31,7 @@
  * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
 
+#include "config.h"
 #include "ReadRequest.h"
 
 CBDATA_CLASS_INIT(ReadRequest);

diff --git a/src/DiskIO/WriteRequest.cc b/src/DiskIO/WriteRequest.cc
index 758f02ef73963a4dcf157779be025a6dffb0b3fa..df47385e4c8e535035393cc3e7e18fb03bdcfcd4 100644 (file)
--- a/src/DiskIO/WriteRequest.cc
+++ b/src/DiskIO/WriteRequest.cc
@@ -31,6 +31,7 @@
  * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
  */
 
+#include "config.h"
 #include "WriteRequest.h"
 
 CBDATA_CLASS_INIT(WriteRequest);

diff --git a/src/EventLoop.cc b/src/EventLoop.cc
index cae15a65df9e72c739cc6fddd6ed8721fd883a96..b281adbc22d6420d26daffa9915dbf3d30b564fe 100644 (file)
--- a/src/EventLoop.cc
+++ b/src/EventLoop.cc
@@ -32,6 +32,7 @@
  *
  */
 
+#include "config.h"
 #include "EventLoop.h"
 #include "base/AsyncCallQueue.h"
 

diff --git a/src/RemovalPolicy.cc b/src/RemovalPolicy.cc
index 30196368dbc380e0733e72e760439cf8d88251cb..de8a58d5f18b0523cd485fe55277b1205301a432 100644 (file)
--- a/src/RemovalPolicy.cc
+++ b/src/RemovalPolicy.cc
@@ -33,7 +33,9 @@
  *
  */
 
+#include "config.h"
 #include "RemovalPolicy.h"
+
 CBDATA_CLASS_INIT(RemovalPolicy);
 CBDATA_CLASS_INIT(RemovalPolicyWalker);
 CBDATA_CLASS_INIT(RemovalPurgeWalker);

diff --git a/src/SquidConfig.cc b/src/SquidConfig.cc
index 657e58ab6216b9e15d002798fb347a10e254c3c6..970e3b483051a43a35b2df9da1535bfef4ea3861 100644 (file)
--- a/src/SquidConfig.cc
+++ b/src/SquidConfig.cc
@@ -2,6 +2,7 @@
  * $Id$
  */
 
+#include "config.h"
 // just for the global definition of Config and Config2
 #include "structs.h"
 

diff --git a/src/StoreSwapLogData.cc b/src/StoreSwapLogData.cc
index 91a2362bf6200ad2f7007edc01ea5203ab6ff8a3..24ae5211202715dac2a3dd3c0192755f93964112 100644 (file)
--- a/src/StoreSwapLogData.cc
+++ b/src/StoreSwapLogData.cc
@@ -32,6 +32,7 @@
  *
  */
 
+#include "config.h"
 #include "StoreSwapLogData.h"
 #include "swap_log_op.h"
 

diff --git a/src/adaptation/ecap/MinimalAdapter.cc b/src/adaptation/ecap/MinimalAdapter.cc
index 767079a6c37f39cc80fac4c75cb18a1f466a1f62..d49952675be79721b3ddb2cd1d50c4d0ef2bf076 100644 (file)
--- a/src/adaptation/ecap/MinimalAdapter.cc
+++ b/src/adaptation/ecap/MinimalAdapter.cc
@@ -1,2 +1,2 @@
-
+#include "config.h"
 // TBD

diff --git a/src/adaptation/icap/History.cc b/src/adaptation/icap/History.cc
index 1b27e34485f2243edfc9cd9cee5634a9de174466..92da86c3f8c5886cd32f8eec96d5be08feb65d4d 100644 (file)
--- a/src/adaptation/icap/History.cc
+++ b/src/adaptation/icap/History.cc
@@ -1,5 +1,5 @@
-#include "adaptation/icap/History.h"
 #include "squid.h"
+#include "adaptation/icap/History.h"
 #include "globals.h"
 #include "SquidTime.h"
 

diff --git a/src/base/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc
index 20167fa88feba640afae1a1ceed9767e907a5ce7..c58e03a10db97698c8cbd81c27888c0ad908a84a 100644 (file)
--- a/src/base/AsyncCallQueue.cc
+++ b/src/base/AsyncCallQueue.cc
@@ -6,6 +6,7 @@
  *
  */
 
+#include "config.h"
 #include "base/AsyncCallQueue.h"
 #include "base/AsyncCall.h"
 

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 3af82631422afa3319ef9ebd9f9fc75e3a4113bf..c6cc67f5c29cdda88b807e72d187c738699e71b9 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -48,6 +48,7 @@
  * when finished.
  */
 
+#include "config.h"
 #include "cbdata.h"
 #include "mgr/Registration.h"
 #include "Store.h"

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index 8b0b4464eec2f4d9ba33ac72da8166507f2ae425..95dbc5eeaf3f64fc7ad771d942d1b75bce26cba8 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -45,9 +45,7 @@
  *                      administrator.
  *****************************************************************************/
 
-//#include "squid.h"
 #include "config.h"
-//#include "SquidTime.h"
 #include "util.h"
 
 #if HAVE_STRING_H

diff --git a/src/fs/coss/StoreFScoss.cc b/src/fs/coss/StoreFScoss.cc
index 5367bc67d381e8a5fdcc99f3b499ebebd45b3dad..fc89f0030994b01ec195f7807b10e5f6a21a1dc1 100644 (file)
--- a/src/fs/coss/StoreFScoss.cc
+++ b/src/fs/coss/StoreFScoss.cc
@@ -33,6 +33,7 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
+#include "config.h"
 #include "StoreFileSystem.h"
 #include "StoreFScoss.h"
 #include "mgr/Registration.h"

diff --git a/src/fs/diskd/StoreFSdiskd.cc b/src/fs/diskd/StoreFSdiskd.cc
index 67e109a80dcd8f5f9f4a6ae5482ddf70d41153f9..4126c127602573e6a3ba693d4d62b8fd054e9288 100644 (file)
--- a/src/fs/diskd/StoreFSdiskd.cc
+++ b/src/fs/diskd/StoreFSdiskd.cc
@@ -35,6 +35,7 @@
 
 /* TODO: remove this file as unused */
 
+#include "config.h"
 #if 0
 #include "StoreFileSystem.h"
 #include "DiskIO/DiskIOModule.h"

diff --git a/src/fs/ufs/StoreFSufs.cc b/src/fs/ufs/StoreFSufs.cc
index 72bee8e4edcef9323ea34a13600034089818a324..79c8bf3c693a9099c7b9715d125a3bf2f5c45bcb 100644 (file)
--- a/src/fs/ufs/StoreFSufs.cc
+++ b/src/fs/ufs/StoreFSufs.cc
@@ -35,6 +35,7 @@
 
 /*TODO: remove this file as unused*/
 
+#include "config.h"
 #if 0
 #include "StoreFileSystem.h"
 #endif

diff --git a/src/tests/stub_cache_manager.cc b/src/tests/stub_cache_manager.cc
index 5b4099eb73ed6b710cc394bc8fa40ee7d80e3479..b744abc637d6146caab67dd1ca2e902e71f69169 100644 (file)
--- a/src/tests/stub_cache_manager.cc
+++ b/src/tests/stub_cache_manager.cc
@@ -29,9 +29,9 @@
  *
  */
 
+#include "squid.h"
 #include "CacheManager.h"
 #include "mgr/Registration.h"
-#include "squid.h"
 
 Mgr::Action::Pointer
 CacheManager::createNamedAction(char const* action)

diff --git a/src/tests/stub_client_side_request.cc b/src/tests/stub_client_side_request.cc
index 3c685908d851aeb8f6de128757d20a69358d2ec2..7bf75c2b5a1228162fe97dc5ad99c2bd1866faf0 100644 (file)
--- a/src/tests/stub_client_side_request.cc
+++ b/src/tests/stub_client_side_request.cc
@@ -31,6 +31,7 @@
  *
  */
 
+#include "config.h"
 #include "client_side_request.h"
 #include "Store.h"
 

diff --git a/src/tests/stub_errorpage.cc b/src/tests/stub_errorpage.cc
index 543af967de9b26fac1eb1c127283f5a273a6485d..306fa9b57c5d03b6b729814232bc906a91d04c82 100644 (file)
--- a/src/tests/stub_errorpage.cc
+++ b/src/tests/stub_errorpage.cc
@@ -32,6 +32,7 @@
  *
  */
 
+#include "config.h"
 #include "errorpage.h"
 
 err_type

diff --git a/src/tests/stub_main_cc.cc b/src/tests/stub_main_cc.cc
index 06496d1717fcc796e73f98632ed3de003a232e6f..8a069a8d6a730795095f5d49e8516b6d5c1768e4 100644 (file)
--- a/src/tests/stub_main_cc.cc
+++ b/src/tests/stub_main_cc.cc
@@ -33,6 +33,8 @@
  *
  */
 
+#include "config.h"
+
 void
 shut_down(int)
 { /* stub */ }

diff --git a/src/tests/testStoreSupport.cc b/src/tests/testStoreSupport.cc
index f09c19cb999ce3daee8d00cf045b9c64c59b8dbb..3cc320f23441668b1db66d4440ba18cce3d82ce1 100644 (file)
--- a/src/tests/testStoreSupport.cc
+++ b/src/tests/testStoreSupport.cc
@@ -32,6 +32,7 @@
  */
 
 #define SQUID_UNIT_TEST 1
+#include "config.h"
 #include "testStoreSupport.h"
 #include "event.h"
 #include "EventLoop.h"

diff --git a/src/url.cc b/src/url.cc
index db1ecb321509b207de29a8309a0dc9a56a9883ba..0e5d688cb8b4f6cd4c33de28c0e387d38b67f266 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -33,6 +33,7 @@
  *
  */
 
+#include "config.h"
 #include "URL.h"
 #include "HttpRequest.h"
 #include "URLScheme.h"

diff --git a/src/wordlist.cc b/src/wordlist.cc
index 39918070d363c64fb8057abf991b2d4494bc13bd..c580f612a9760c8ef6e322102696bd05174abced 100644 (file)
--- a/src/wordlist.cc
+++ b/src/wordlist.cc
@@ -33,6 +33,7 @@
  *
  */
 
+#include "config.h"
 #include "wordlist.h"
 #include "MemBuf.h"
 

diff --git a/tools/purge/conffile.cc b/tools/purge/conffile.cc
index 39f8f1a3e1c1160ed5421251b5ef520911776f3f..6848571d1427f004911cd3bbc2b49073824f0fe1 100644 (file)
--- a/tools/purge/conffile.cc
+++ b/tools/purge/conffile.cc
@@ -1,3 +1,5 @@
+#include "config.h"
+
 //
 // $Id$
 //
@@ -46,7 +48,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <regex.h>
 
 int
 readConfigFile( CacheDirVector& cachedir, const char* fn, FILE* debug )

diff --git a/tools/purge/convert.cc b/tools/purge/convert.cc
index 64238121ce00049fed5a9701ff318dc51e74c8e2..590efa0c15092d0f8d49c804084c37006507f6a1 100644 (file)
--- a/tools/purge/convert.cc
+++ b/tools/purge/convert.cc
@@ -1,3 +1,5 @@
+#include "config.h"
+
 //
 // $Id$
 //
@@ -74,7 +76,7 @@ my_inet_ntoa( const struct in_addr& a, HostAddress output )
         unsigned char s[sizeof(a.s_addr)];
         memcpy( s, &a.s_addr, sizeof(a.s_addr) );
 
-        sprintf( output, "%d.%d.%d.%d", s[0], s[1], s[2], s[3] );
+        snprintf(output, sizeof(HostAddress), "%d.%d.%d.%d", s[0], s[1], s[2], s[3] );
     }
     return output;
 }
@@ -87,7 +89,7 @@ my_sock_ntoa( const struct sockaddr_in& a, SockAddress buffer )
 // returns: pointer to buffer
 {
     HostAddress host;
-    sprintf( buffer, "%s:%u",
+    snprintf( buffer, sizeof(SockAddress), "%s:%u",
              my_inet_ntoa(a.sin_addr,host), ntohs(a.sin_port) );
     return buffer;
 }

diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc
index 129e6d1c2d4e3132f7323c0dd1e398b19226de52..07f90e336162ac5d3634bdf9e1fa104e4dbc7777 100644 (file)
--- a/tools/purge/socket.cc
+++ b/tools/purge/socket.cc
@@ -1,3 +1,5 @@
+#include "config.h"
+
 //
 // $Id$
 //