Cleanup: remove SQUID_NO_STRING_BUFFER_PROTECT and SQUID_UNIT_TEST macros

These macros were used solely to prevent cppunit and operating system
includes from generating build errors and warnings via Squid protection
from unsafe use of sprintf, strdup and other allocator and string
functions.

The protection against these functions has long ago been move to
source-maintenance script instead of runtime checking. Making these
macros obsolete.

diff --git a/compat/os/solaris.h b/compat/os/solaris.h
index a62cc2cf47f0d0bc592753ed5275d386f6c6edf9..82537b998f5843d9ad9a3a60142e32085ddfca20 100644 (file)
--- a/compat/os/solaris.h
+++ b/compat/os/solaris.h
@@ -64,12 +64,6 @@ SQUIDCEXTERN int gethostname(char *, int);
 #define __FUNCTION__ ""
 #endif
 
-/* Exclude CPPUnit tests from the allocator restrictions. */
-/* BSD implementation uses these still */
-#if defined(SQUID_UNIT_TEST)
-#define SQUID_NO_STRING_BUFFER_PROTECT 1
-#endif
-
 /* Bug 2500: Solaris 10/11 require s6_addr* defines. */
 //#define s6_addr8   _S6_un._S6_u8
 //#define s6_addr16  _S6_un._S6_u16

diff --git a/compat/testPreCompiler.cc b/compat/testPreCompiler.cc
index 35aa00ebd5ca9234c4949b315a3021e133b633ba..6d0c9f29ddbc9c671d83c7d0ee06c7536ed7b14b 100644 (file)
--- a/compat/testPreCompiler.cc
+++ b/compat/testPreCompiler.cc
@@ -1,10 +1,8 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
+#include "testPreCompiler.h"
 
 #include <cassert>
 
-#include "testPreCompiler.h"
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testPreCompiler );
 
 /**

diff --git a/lib/snmplib/mib.c b/lib/snmplib/mib.c
index a868fd1edf0c04bcf2eebbf411d8d4a70da66a7e..0eba06a713530f0624a4512756258e1ef97c1152 100644 (file)
--- a/lib/snmplib/mib.c
+++ b/lib/snmplib/mib.c
@@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 ******************************************************************/
 
-#define SQUID_NO_STRING_BUFFER_PROTECT 1
 #include "squid.h"
 
 #if HAVE_UNISTD_H

diff --git a/lib/tests/testRFC1035.cc b/lib/tests/testRFC1035.cc
index 8b5582088746687e4d87bb34299a52a8fec5304b..e7a2fd82109ce23abf4891e59da87a0eab53ab15 100644 (file)
--- a/lib/tests/testRFC1035.cc
+++ b/lib/tests/testRFC1035.cc
@@ -1,10 +1,8 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
+#include "testRFC1035.h"
 
 #include <cassert>
 
-#include "testRFC1035.h"
-
 /* Being a C library code it is best bodily included and tested with C++ type-safe techniques. */
 #include "lib/rfc1035.c"
 #include "lib/rfc2671.c"

diff --git a/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc
index 54c32e2933c1cebf45816ceb337a59679f8a96d5..426aa992ed384fdef7e1b26f1b9f01b83377774f 100644 (file)
--- a/lib/tests/testRFC1738.cc
+++ b/lib/tests/testRFC1738.cc
@@ -1,10 +1,8 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
+#include "testRFC1738.h"
 
 #include <cassert>
 
-#include "testRFC1738.h"
-
 /* Being a C library code it is best bodily included and tested with C++ type-safe techniques. */
 #include "lib/rfc1738.c"
 

diff --git a/src/base/testCharacterSet.cc b/src/base/testCharacterSet.cc
index c1b71d3c3e69b6220ea94f7c8099dcf1ed5fcacf..39f40c766b30230ff6fe5c99d55c2a1bfcd6e85e 100644 (file)
--- a/src/base/testCharacterSet.cc
+++ b/src/base/testCharacterSet.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "base/CharacterSet.h"
 #include "testCharacterSet.h"

diff --git a/src/base/testCharacterSet.h b/src/base/testCharacterSet.h
index 83a281758aa6489d91e8370a3bec4eb04ed2f9ae..49ece9b1d9b91b762f5f3a9787eb6f54150062a2 100644 (file)
--- a/src/base/testCharacterSet.h
+++ b/src/base/testCharacterSet.h
@@ -1,8 +1,6 @@
 #ifndef SQUID_BASE_TESTCHARACTERSET_H
 #define SQUID_BASE_TESTCHARACTERSET_H
 
-#define SQUID_UNIT_TEST 1
-
 #include <cppunit/extensions/HelperMacros.h>
 
 class testCharacterSet : public CPPUNIT_NS::TestFixture

diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc
index 2532f4e72aaee3e9e3f443aff232a13178231e6c..a3caeb002ecc53661d75f96f01dfa3f0e7f9c2a7 100644 (file)
--- a/src/icmp/testIcmp.cc
+++ b/src/icmp/testIcmp.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #define SQUID_HELPER 1
 
 #include "squid.h"

diff --git a/src/icmp/testIcmp.h b/src/icmp/testIcmp.h
index 90da1a927403624c51d41e7b0068ad1f31a7842a..932edb385261390dabb13b75f10458f82cd3c334 100644 (file)
--- a/src/icmp/testIcmp.h
+++ b/src/icmp/testIcmp.h
@@ -1,8 +1,6 @@
 #ifndef SQUID_SRC_TEST_URL_H
 #define SQUID_SRC_TEST_URL_H
 
-#define SQUID_UNIT_TEST 1
-
 #include "Icmp.h"
 #include <cppunit/extensions/HelperMacros.h>
 

diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index 49d60d1d8c5be5d9c67047ca552d4ee1dcdbb20f..a0edeb2bab41a22341e1e0f3f01f0b81d129a509 100644 (file)
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 #include "ip/Address.h"
 #include "ip/tools.h"

diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc
index e9e489071b3d9376ab94ddf7fdb2d49048c3b029..2303d8b61cd4d6652358de5f25b9514654aec5c6 100644 (file)
--- a/src/tests/testACLMaxUserIP.cc
+++ b/src/tests/testACLMaxUserIP.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #if USE_AUTH

diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc
index 05272830c37fdb91412b396a7eaaad4ca356c137..5846d49d0a5339d6388f433d1dde505139863427 100644 (file)
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 
 #if USE_AUTH

diff --git a/src/tests/testBoilerplate.cc b/src/tests/testBoilerplate.cc
index 9a4887ddc657968463be68cfc7cecdc8a78a0b97..2e3a460d722c1885c13589b026708d5f79b137af 100644 (file)
--- a/src/tests/testBoilerplate.cc
+++ b/src/tests/testBoilerplate.cc
@@ -1,6 +1,4 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
-
 #include "testBoilerplate.h"
 
 #include <stdexcept>

diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc
index 7d6691eed34ec4b943624e7c95318d2e1912eac9..396d51ba77ba33ab0f241c04a6c48dfda818a7b8 100644 (file)
--- a/src/tests/testCacheManager.cc
+++ b/src/tests/testCacheManager.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "CacheManager.h"
 #include "Mem.h"

diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc
index 48c924b29c1a0b0deeae61ec66bf734e21366442..962f3eef5903461ec7ec6ed8856056c00bf2e728 100644 (file)
--- a/src/tests/testConfigParser.cc
+++ b/src/tests/testConfigParser.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 #include "ConfigParser.h"
 #include "event.h"

diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index 7e66977d4f025e5ea413d42f949587d6d5d4ee6c..2e778991ed75775130c040e68fc39f0f1617065f 100644 (file)
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -1,6 +1,4 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
-
 #include "DiskIO/DiskIOModule.h"
 #include "HttpHeader.h"
 #include "HttpReply.h"

diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc
index f18d7b805f92943855fd3828d31b8e6e11fad4a5..ab4378dee1cad876129b30cf72ca7d6f4bb0c98a 100644 (file)
--- a/src/tests/testEvent.cc
+++ b/src/tests/testEvent.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #include <cppunit/TestAssert.h>

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index b7b50925ee7794f71fcee8a0935ef0e08e782585..cf53aa8c7fb7c529f6f7bea481c24ce499a8cd68 100644 (file)
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #include <cppunit/TestAssert.h>

diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc
index 9c22b6799d4f0737c2f01b6cc4c8955ab2b6e5ba..f8a7a94f1d59ade4428651a411b080e2c997b7a9 100644 (file)
--- a/src/tests/testHttpParser.cc
+++ b/src/tests/testHttpParser.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #include <cppunit/TestAssert.h>

diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index 18503f021dd0c5ec473a2bd2f5a828b2be2c0b60..9897f6c7fece289cfcf450111c46f165a3962e98 100644 (file)
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 #include <cppunit/TestAssert.h>
 

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 7851940244a0952aa373f2f49a1ebac45494e7b7..6c088de041749b3efd944eb4c04c57cf8d4af25b 100644 (file)
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #include <cppunit/TestAssert.h>

diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc
index 74883302a6b2a03ed3198abfcd5f61a8060bcd5e..14b7ed59dbee9f853e39f9bc6e5169c23546f7a1 100644 (file)
--- a/src/tests/testHttpRequestMethod.cc
+++ b/src/tests/testHttpRequestMethod.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include <cppunit/TestAssert.h>
 

diff --git a/src/tests/testMain.cc b/src/tests/testMain.cc
index 30a6a82bbc73b080d1b2ec33dfc6f4a87538b821..605a7b8b44d551dd6de71bb0fce4d1c050364db0 100644 (file)
--- a/src/tests/testMain.cc
+++ b/src/tests/testMain.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #include <cppunit/BriefTestProgressListener.h>

diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc
index b0eba88678f17b840a2df0d1b3b9037d979cf996..d41c5fd043156a61940d80ecbdac4089fc622025 100644 (file)
--- a/src/tests/testRock.cc
+++ b/src/tests/testRock.cc
@@ -1,6 +1,4 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
-
 #include "ConfigParser.h"
 #include "DiskIO/DiskIOModule.h"
 #include "fs/rock/RockSwapDir.h"

diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc
index 1bb824f175ae6e536ba408700a9f0ce6eaf78105..a5d83a251aad98c631eddad523a4dca4277cf094 100644 (file)
--- a/src/tests/testStatHist.cc
+++ b/src/tests/testStatHist.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 #include "StatHist.h"
 #include "testStatHist.h"

diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index ab2b01c157854b8f006ee7d7bb330030424902cd..cd8e4200c0f00808f4a6874820ae915cbbe6d53a 100644 (file)
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "Store.h"
 #include "testStore.h"

diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc
index a40c15a0c38d879b69590a49dcc3ecff8ba85e1b..2f5e3ccb4fb3f409b5fd3c08319161cc4163ecc0 100644 (file)
--- a/src/tests/testStoreController.cc
+++ b/src/tests/testStoreController.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "Mem.h"
 #include "MemObject.h"

diff --git a/src/tests/testStoreEntryStream.cc b/src/tests/testStoreEntryStream.cc
index 7f83f9be683ff713a3c2debeadcdc8dd137ea09c..8364f4ea6b1d163bf05a5166bda88b750c0a4246 100644 (file)
--- a/src/tests/testStoreEntryStream.cc
+++ b/src/tests/testStoreEntryStream.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "CapturingStoreEntry.h"
 #include "Mem.h"

diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc
index 1a82b86421e086a701454fb60279f8f702e530b3..4b0657d953fbd8e70a9ff565a3b4de2dd03db93f 100644 (file)
--- a/src/tests/testStoreHashIndex.cc
+++ b/src/tests/testStoreHashIndex.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "Mem.h"
 #include "MemObject.h"

diff --git a/src/tests/testStoreSupport.cc b/src/tests/testStoreSupport.cc
index 2db03c4f42b6380cefd80548b309f7db37ef5c63..f591d99821e82615d5a19a69ba4cf740d47f0a9f 100644 (file)
--- a/src/tests/testStoreSupport.cc
+++ b/src/tests/testStoreSupport.cc
@@ -30,8 +30,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
-
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 #include "event.h"
 #include "EventLoop.h"

diff --git a/src/tests/testString.cc b/src/tests/testString.cc
index 090d426ee4ed5d5abe49f1ebb087ee8138ad8a47..88c03e139fbe054302d618d236de01408a6c8e37 100644 (file)
--- a/src/tests/testString.cc
+++ b/src/tests/testString.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 #include "event.h"
 #include "Mem.h"

diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index efa295c3fd56685e8aeb16fa142835468e92a59b..37a595274ac9aa83e1576ebe755749963da46841 100644 (file)
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -1,4 +1,3 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
 
 #include <cppunit/TestAssert.h>

diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index e850076c1e5b7da28ce405a8ca6b72aa4ae43832..010abc3612d67e52849156135e5a3d9beed77c39 100644 (file)
--- a/src/tests/testUfs.cc
+++ b/src/tests/testUfs.cc
@@ -1,6 +1,4 @@
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
-
 #include "DiskIO/DiskIOModule.h"
 #include "fs/ufs/UFSSwapDir.h"
 #include "globals.h"

diff --git a/src/tests/testUriScheme.cc b/src/tests/testUriScheme.cc
index 3877f548baa452d0cbe2272f251fe38ed6c70d4c..fde667fd664f35c6bb30ce3c902a76fb13543add 100644 (file)
--- a/src/tests/testUriScheme.cc
+++ b/src/tests/testUriScheme.cc
@@ -1,5 +1,3 @@
-#define SQUID_UNIT_TEST 1
-
 #include "squid.h"
 
 #include <cppunit/TestAssert.h>

diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc
index 160a96beb2e897faa30dcc778e0c625170f6e3f0..20c588f1960f3d8f63df1f5d47e77cfee3fadb43 100644 (file)
--- a/src/tests/test_http_range.cc
+++ b/src/tests/test_http_range.cc
@@ -29,23 +29,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  *
  */
-#define SQUID_UNIT_TEST 1
 #include "squid.h"
-
-#if 0
-//#include "Store.h"
-//#include "client_side_request.h"
-#endif
-
-/** \todo CLEANUP: This file shoudl be called something_stub.cc */
-
 #include "HttpHeader.h"
 #include "HttpHeaderRange.h"
 #include "Mem.h"
 
-#if 0
-#include "acl/Checklist.h"
-#endif
+/** \todo CLEANUP: This file should be called something_stub.cc */
 
 void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str)
 {