From: Source Maintenance <squidadm@squid-cache.org>
Date: Sun, 4 Jan 2015 12:12:05 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~376
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dd8e707448263e198ded20c191e1ab748cc2f23;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/include/unitTestMain.h b/include/unitTestMain.h
index 45dfc1fa46..bf48004519 100644
--- a/include/unitTestMain.h
+++ b/include/unitTestMain.h
@@ -49,3 +49,4 @@ main( int argc, char* argv[] )
 }
 
 #endif /* SQUID_INCLUDE_UNITTESTMAIN_H */
+
diff --git a/src/base/testCharacterSet.cc b/src/base/testCharacterSet.cc
index 6bebecf022..6c00a2d39f 100644
--- a/src/base/testCharacterSet.cc
+++ b/src/base/testCharacterSet.cc
@@ -11,7 +11,6 @@
 #include "testCharacterSet.h"
 #include "unitTestMain.h"
 
-
 #include <string>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testCharacterSet );
diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc
index f8eee8228c..431584bb85 100644
--- a/src/icmp/testIcmp.cc
+++ b/src/icmp/testIcmp.cc
@@ -15,7 +15,6 @@
 #include "testIcmp.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testIcmp );
 
 #if USE_ICMP
diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index 5bb5068a50..3b5d0908f7 100644
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -12,7 +12,6 @@
 #include "testAddress.h"
 #include "unitTestMain.h"
 
-
 #include <cstring>
 #include <stdexcept>
 #include <string>
diff --git a/src/parser/testTokenizer.cc b/src/parser/testTokenizer.cc
index 4e7f8451dd..92b4a77a33 100644
--- a/src/parser/testTokenizer.cc
+++ b/src/parser/testTokenizer.cc
@@ -12,7 +12,6 @@
 #include "testTokenizer.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testTokenizer );
 
 SBuf text("GET http://resource.com/path HTTP/1.1\r\n"
diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc
index 9759966d63..5c94733d2b 100644
--- a/src/tests/testConfigParser.cc
+++ b/src/tests/testConfigParser.cc
@@ -13,7 +13,6 @@
 #include "testConfigParser.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testConfigParser);
 
 /* let this test link sanely */
diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index e86e836c91..c3fa1b7622 100644
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -18,7 +18,6 @@
 #include "testStoreSupport.h"
 #include "unitTestMain.h"
 
-
 #include <stdexcept>
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testDiskIO );
diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc
index 7b0c3d458a..5c61ec0149 100644
--- a/src/tests/testEvent.cc
+++ b/src/tests/testEvent.cc
@@ -17,7 +17,6 @@
 #include "testEvent.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testEvent );
 
 /* init legacy static-initialized modules */
diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 0255a6c5b8..cf3fee2c25 100644
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -18,7 +18,6 @@
 #include "testEventLoop.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop );
 
 /* init legacy static-initialized modules */
diff --git a/src/tests/testHttp1Parser.cc b/src/tests/testHttp1Parser.cc
index 4662733771..38d2b1825a 100644
--- a/src/tests/testHttp1Parser.cc
+++ b/src/tests/testHttp1Parser.cc
@@ -21,7 +21,6 @@
 #include "testHttp1Parser.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttp1Parser );
 
 void
diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index f0ef0038d6..161c204863 100644
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -16,7 +16,6 @@
 #include "testHttpReply.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
 
 class SquidConfig Config;
diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 08b0ee4aed..428e3ee062 100644
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -16,7 +16,6 @@
 #include "testHttpRequest.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
 
 /** wrapper for testing HttpRequest object private and protected functions */
diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc
index 9e25a91f94..610753a60d 100644
--- a/src/tests/testRock.cc
+++ b/src/tests/testRock.cc
@@ -24,7 +24,6 @@
 #include "testStoreSupport.h"
 #include "unitTestMain.h"
 
-
 #include <stdexcept>
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 2709e93ca6..50ace45b3f 100644
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -15,7 +15,6 @@
 #include "testSBuf.h"
 #include "unitTestMain.h"
 
-
 #include <iostream>
 #include <stdexcept>
 
diff --git a/src/tests/testSBufList.cc b/src/tests/testSBufList.cc
index 03fd77cdc8..340fb3c871 100644
--- a/src/tests/testSBufList.cc
+++ b/src/tests/testSBufList.cc
@@ -12,7 +12,6 @@
 #include "testSBufList.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testSBufList );
 
 SBuf literal("The quick brown fox jumped over the lazy dog");
diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc
index abcfb63997..9a0f413b66 100644
--- a/src/tests/testStatHist.cc
+++ b/src/tests/testStatHist.cc
@@ -11,7 +11,6 @@
 #include "testStatHist.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION(testStatHist);
 
 typedef enum {
diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index 0aa855caa5..6ff3a47277 100644
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -11,7 +11,6 @@
 #include "testStore.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testStore );
 
 int
diff --git a/src/tests/testString.cc b/src/tests/testString.cc
index 5f19927c32..979d8fc7d6 100644
--- a/src/tests/testString.cc
+++ b/src/tests/testString.cc
@@ -12,7 +12,6 @@
 #include "testString.h"
 #include "unitTestMain.h"
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION( testString );
 
 /* let this test link sanely */
diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index de02cb1177..805f740176 100644
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -11,9 +11,8 @@
 #include <cppunit/TestAssert.h>
 
 #include "testURL.h"
-#include "URL.h"
 #include "unitTestMain.h"
-
+#include "URL.h"
 
 #include <sstream>
 
diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc
index 69cd80ff6d..dad289f44c 100644
--- a/src/tests/testUfs.cc
+++ b/src/tests/testUfs.cc
@@ -21,7 +21,6 @@
 #include "testUfs.h"
 #include "unitTestMain.h"
 
-
 #include <stdexcept>
 
 #define TESTDIR "testUfs_Store"