SourceFormat Enforcement

diff --git a/include/rfc3986.h b/include/rfc3986.h
index 43f610328752296a152042588de03556a5c2705c..94eb4aca16c8b1ee24c87e3088a452098a93a7f0 100644 (file)
--- a/include/rfc3986.h
+++ b/include/rfc3986.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -15,9 +15,9 @@
 namespace Rfc1738
 {
 extern const CharacterSet
-        Unsafe,  // RFC 1738 unsafe set
-        Reserved, // RFC 1738 Reserved set
-        Unescaped; // RFC 1738 Unsafe and RFC 5234 CTL
+Unsafe,  // RFC 1738 unsafe set
+Reserved, // RFC 1738 Reserved set
+Unescaped; // RFC 1738 Unsafe and RFC 5234 CTL
 }
 
 // RFC 3986 URL-encoding
@@ -25,12 +25,12 @@ namespace Rfc3986
 {
 
 extern const CharacterSet
-        GenDelims,// RFC 3986 gen-delims set
-        SubDelims,// RFC 3986 sub-delims set
-        Reserved, // RFC 3986 reserved characters set
-        Unreserved, // RFC 3986 unreserved characters set
-        Unescaped, // CTL and unsafe except for percent symbol
-        All;
+GenDelims,// RFC 3986 gen-delims set
+SubDelims,// RFC 3986 sub-delims set
+Reserved, // RFC 3986 reserved characters set
+Unreserved, // RFC 3986 unreserved characters set
+Unescaped, // CTL and unsafe except for percent symbol
+All;
 
 // integer representation of hex numeric characters
 extern int fromhex[256];
@@ -85,7 +85,8 @@ String unescape(const String &s)
         const int x = v1 << 4 | v2;
         if (x > 0 && x <= 255) {
             rv.push_back(static_cast<char>(x));
-            ++in; ++in;
+            ++in;
+            ++in;
             continue;
         }
         rv.push_back(*in);
@@ -119,3 +120,4 @@ String escape(const String &s, const CharacterSet &escapeChars = Rfc1738::Unesca
 } // namespace Rfc3986
 
 #endif /* SQUID_INCLUDE_RFC3986_H */
+

diff --git a/lib/rfc3986.cc b/lib/rfc3986.cc
index d1ab41a3b0bcb64575b11be5d72572f8512856d9..2f81b59332cd131a1049a889f2d50c85cd391471 100644 (file)
--- a/lib/rfc3986.cc
+++ b/lib/rfc3986.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -7,8 +7,8 @@
  */
 
 #include "squid.h"
-#include "rfc3986.h"
 #include "base/CharacterSet.h"
+#include "rfc3986.h"
 
 // these should be moved to rfc1738.cc when it exists
 namespace Rfc1738
@@ -34,11 +34,11 @@ namespace Rfc1738
 */
 
 const CharacterSet
-    Unsafe("rfc1738:unsafe", " <>\"#%{}|\\^~[]`"),
-    Reserved("rfc1738:reserved", ";/?:@&="),
-    // ? why called unescaped ? its the set which must never be used unescaped
-    Unescaped = (Unsafe + CharacterSet::CTL + CharacterSet::OBSTEXT).rename("rfc1738:unescaped")
-    ;
+Unsafe("rfc1738:unsafe", " <>\"#%{}|\\^~[]`"),
+       Reserved("rfc1738:reserved", ";/?:@&="),
+       // ? why called unescaped ? its the set which must never be used unescaped
+       Unescaped = (Unsafe + CharacterSet::CTL + CharacterSet::OBSTEXT).rename("rfc1738:unescaped")
+                   ;
 
 } // namespace Rfc1738
 
@@ -46,57 +46,57 @@ namespace Rfc3986
 {
 
 const CharacterSet
-    GenDelims("rfc3986:gen-delims",":/?#[]@"),
-    SubDelims("rfc3986:sub-delims","!$&'()*+,;="),
-    Reserved = (GenDelims + SubDelims).rename("rfc3986:reserved"),
-    Unreserved = CharacterSet("rfc3986:unreserved","-._~") +
-        CharacterSet::ALPHA + CharacterSet::DIGIT,
-    // ?
-    All = (Rfc1738::Unsafe + Reserved + CharacterSet::CTL).rename("rfc3986:all")
-    ;
+GenDelims("rfc3986:gen-delims",":/?#[]@"),
+          SubDelims("rfc3986:sub-delims","!$&'()*+,;="),
+          Reserved = (GenDelims + SubDelims).rename("rfc3986:reserved"),
+          Unreserved = CharacterSet("rfc3986:unreserved","-._~") +
+                       CharacterSet::ALPHA + CharacterSet::DIGIT,
+                       // ?
+                       All = (Rfc1738::Unsafe + Reserved + CharacterSet::CTL).rename("rfc3986:all")
+                             ;
 
 // integer representation of hex numeric characters,
 // or -1 for characters invalid in hex representation
 int fromhex[256] = {
-  // 0-127 (7-bit ASCII)
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0-15
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 16-31
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 32-47
-   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, // 48-63
-  -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 64-79
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 80-95
-  -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 96-111
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 112-127
-
-  // 128-255 (8-bit UTF-8)
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    // 0-127 (7-bit ASCII)
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0-15
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 16-31
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 32-47
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, // 48-63
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 64-79
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 80-95
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 96-111
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 112-127
+
+    // 128-255 (8-bit UTF-8)
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 };
 
 // a hex string representation of each UTF-8 character
 const char * const tohex[256] = {
- "00","01","02","03","04","05","06","07","08","09","0A","0B","0C","0D","0E","0F",
- "10","11","12","13","14","15","16","17","18","19","1A","1B","1C","1D","1E","1F",
- "20","21","22","23","24","25","26","27","28","29","2A","2B","2C","2D","2E","2F",
- "30","31","32","33","34","35","36","37","38","39","3A","3B","3C","3D","3E","3F",
- "40","41","42","43","44","45","46","47","48","49","4A","4B","4C","4D","4E","4F",
- "50","51","52","53","54","55","56","57","58","59","5A","5B","5C","5D","5E","5F",
- "60","61","62","63","64","65","66","67","68","69","6A","6B","6C","6D","6E","6F",
- "70","71","72","73","74","75","76","77","78","79","7A","7B","7C","7D","7E","7F",
- "80","81","82","83","84","85","86","87","88","89","8A","8B","8C","8D","8E","8F",
- "90","91","92","93","94","95","96","97","98","99","9A","9B","9C","9D","9E","9F",
- "A0","A1","A2","A3","A4","A5","A6","A7","A8","A9","AA","AB","AC","AD","AE","AF",
- "B0","B1","B2","B3","B4","B5","B6","B7","B8","B9","BA","BB","BC","BD","BE","BF",
- "C0","C1","C2","C3","C4","C5","C6","C7","C8","C9","CA","CB","CC","CD","CE","CF",
- "D0","D1","D2","D3","D4","D5","D6","D7","D8","D9","DA","DB","DC","DD","DE","DF",
- "E0","E1","E2","E3","E4","E5","E6","E7","E8","E9","EA","EB","EC","ED","EE","EF",
- "F0","F1","F2","F3","F4","F5","F6","F7","F8","F9","FA","FB","FC","FD","FE","FF"
+    "00","01","02","03","04","05","06","07","08","09","0A","0B","0C","0D","0E","0F",
+    "10","11","12","13","14","15","16","17","18","19","1A","1B","1C","1D","1E","1F",
+    "20","21","22","23","24","25","26","27","28","29","2A","2B","2C","2D","2E","2F",
+    "30","31","32","33","34","35","36","37","38","39","3A","3B","3C","3D","3E","3F",
+    "40","41","42","43","44","45","46","47","48","49","4A","4B","4C","4D","4E","4F",
+    "50","51","52","53","54","55","56","57","58","59","5A","5B","5C","5D","5E","5F",
+    "60","61","62","63","64","65","66","67","68","69","6A","6B","6C","6D","6E","6F",
+    "70","71","72","73","74","75","76","77","78","79","7A","7B","7C","7D","7E","7F",
+    "80","81","82","83","84","85","86","87","88","89","8A","8B","8C","8D","8E","8F",
+    "90","91","92","93","94","95","96","97","98","99","9A","9B","9C","9D","9E","9F",
+    "A0","A1","A2","A3","A4","A5","A6","A7","A8","A9","AA","AB","AC","AD","AE","AF",
+    "B0","B1","B2","B3","B4","B5","B6","B7","B8","B9","BA","BB","BC","BD","BE","BF",
+    "C0","C1","C2","C3","C4","C5","C6","C7","C8","C9","CA","CB","CC","CD","CE","CF",
+    "D0","D1","D2","D3","D4","D5","D6","D7","D8","D9","DA","DB","DC","DD","DE","DF",
+    "E0","E1","E2","E3","E4","E5","E6","E7","E8","E9","EA","EB","EC","ED","EE","EF",
+    "F0","F1","F2","F3","F4","F5","F6","F7","F8","F9","FA","FB","FC","FD","FE","FF"
 };
 
 } // namespace Rfc3986

diff --git a/src/tests/testRFC3986.cc b/src/tests/testRFC3986.cc
index 863883777b31572f7e5cb4deeca0f9f761f65499..7f93b708798f2e2eb151a2ba062b80c0b64f63ff 100644 (file)
--- a/src/tests/testRFC3986.cc
+++ b/src/tests/testRFC3986.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -7,9 +7,9 @@
  */
 
 #include "squid.h"
+#include "rfc1738.h"
 #include "SBuf.h"
 #include "testRFC3986.h"
-#include "rfc1738.h"
 #include "unitTestMain.h"
 
 #include <cassert>
@@ -36,7 +36,7 @@ void testRFC3986::testUrlDecode()
 {
     performDecodingTest("%2Fdata%2Fsource%2Fpath","/data/source/path");
     performDecodingTest("http://foo.invalid%2Fdata%2Fsource%2Fpath",
-                    "http://foo.invalid/data/source/path");
+                        "http://foo.invalid/data/source/path");
     // TODO query string
 
     performDecodingTest("1 w%0Ard","1 w\nrd"); // Newline %0A encoded
@@ -51,7 +51,7 @@ void testRFC3986::testUrlDecode()
     performDecodingTest("10 word%1","10 word%1");
     performDecodingTest("11 word%1q","11 word%1q");
     performDecodingTest("12 word%1a","12 word\032");
- }
+}
 
 // perform a test for std::string, SBuf and if rfc1738flag is != 0 compare
 //  against rfc1738 implementation
@@ -129,4 +129,3 @@ testRFC3986::testPerformance()
 
 }
 
-

diff --git a/src/tests/testRFC3986.h b/src/tests/testRFC3986.h
index 267941192274cd39fba389e97d4d9e5ac40ac672..2b505d9d6e4853932ae418903ddd05cc0b11900d 100644 (file)
--- a/src/tests/testRFC3986.h
+++ b/src/tests/testRFC3986.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.