From: Amos Jeffries Date: Mon, 25 Aug 2014 04:53:57 +0000 (-0700) Subject: Cleanup: remove SQUID_NO_STRING_BUFFER_PROTECT and SQUID_UNIT_TEST macros X-Git-Tag: SQUID_3_5_0_1~99 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22aa015b9c19fa30b4861a2d598f5f8be1189721;p=thirdparty%2Fsquid.git 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 a62cc2cf47..82537b998f 100644 --- 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 35aa00ebd5..6d0c9f29dd 100644 --- a/compat/testPreCompiler.cc +++ b/compat/testPreCompiler.cc @@ -1,10 +1,8 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" +#include "testPreCompiler.h" #include -#include "testPreCompiler.h" - CPPUNIT_TEST_SUITE_REGISTRATION( testPreCompiler ); /** diff --git a/lib/snmplib/mib.c b/lib/snmplib/mib.c index a868fd1edf..0eba06a713 100644 --- 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 8b55820887..e7a2fd8210 100644 --- 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 -#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 54c32e2933..426aa992ed 100644 --- 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 -#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 c1b71d3c3e..39f40c766b 100644 --- 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 83a281758a..49ece9b1d9 100644 --- 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 class testCharacterSet : public CPPUNIT_NS::TestFixture diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc index 2532f4e72a..a3caeb002e 100644 --- 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 90da1a9274..932edb3852 100644 --- 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 diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc index 49d60d1d8c..a0edeb2bab 100644 --- 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 e9e489071b..2303d8b61c 100644 --- 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 05272830c3..5846d49d0a 100644 --- 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 9a4887ddc6..2e3a460d72 100644 --- 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 diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc index 7d6691eed3..396d51ba77 100644 --- 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 48c924b29c..962f3eef59 100644 --- 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 7e66977d4f..2e778991ed 100644 --- 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 f18d7b805f..ab4378dee1 100644 --- a/src/tests/testEvent.cc +++ b/src/tests/testEvent.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc index b7b50925ee..cf53aa8c7f 100644 --- a/src/tests/testEventLoop.cc +++ b/src/tests/testEventLoop.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc index 9c22b6799d..f8a7a94f1d 100644 --- a/src/tests/testHttpParser.cc +++ b/src/tests/testHttpParser.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc index 18503f021d..9897f6c7fe 100644 --- a/src/tests/testHttpReply.cc +++ b/src/tests/testHttpReply.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc index 7851940244..6c088de041 100644 --- a/src/tests/testHttpRequest.cc +++ b/src/tests/testHttpRequest.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc index 74883302a6..14b7ed59db 100644 --- a/src/tests/testHttpRequestMethod.cc +++ b/src/tests/testHttpRequestMethod.cc @@ -1,5 +1,3 @@ -#define SQUID_UNIT_TEST 1 - #include "squid.h" #include diff --git a/src/tests/testMain.cc b/src/tests/testMain.cc index 30a6a82bbc..605a7b8b44 100644 --- a/src/tests/testMain.cc +++ b/src/tests/testMain.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc index b0eba88678..d41c5fd043 100644 --- 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 1bb824f175..a5d83a251a 100644 --- 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 ab2b01c157..cd8e4200c0 100644 --- 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 a40c15a0c3..2f5e3ccb4f 100644 --- 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 7f83f9be68..8364f4ea6b 100644 --- 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 1a82b86421..4b0657d953 100644 --- 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 2db03c4f42..f591d99821 100644 --- 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 090d426ee4..88c03e139f 100644 --- 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 efa295c3fd..37a595274a 100644 --- a/src/tests/testURL.cc +++ b/src/tests/testURL.cc @@ -1,4 +1,3 @@ -#define SQUID_UNIT_TEST 1 #include "squid.h" #include diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc index e850076c1e..010abc3612 100644 --- 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 3877f548ba..fde667fd66 100644 --- a/src/tests/testUriScheme.cc +++ b/src/tests/testUriScheme.cc @@ -1,5 +1,3 @@ -#define SQUID_UNIT_TEST 1 - #include "squid.h" #include diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc index 160a96beb2..20c588f196 100644 --- 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) {