From: Source Maintenance <squidadm@squid-cache.org>
Date: Sat, 2 Jan 2016 18:12:11 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_4_0_4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0049f30f377f9d5d8fcaf8eebc61d71bbc0a1cc9;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/base/CharacterSet.cc b/src/base/CharacterSet.cc
index 31df3964e3..ea86f8726b 100644
--- a/src/base/CharacterSet.cc
+++ b/src/base/CharacterSet.cc
@@ -120,26 +120,27 @@ operator <<(std::ostream &s, const CharacterSet &c)
 
 const CharacterSet
 // RFC 5234
-    CharacterSet::ALPHA("ALPHA", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-    CharacterSet::BIT("BIT","01"),
-    CharacterSet::CR("CR","\r"),
-    CharacterSet::CTL("CTL",{{0x01,0x1f},{0x7f,0x7f}}),
-    CharacterSet::DIGIT("DIGIT","0123456789"),
-    CharacterSet::DQUOTE("DQUOTE","\""),
-    CharacterSet::HEXDIG("HEXDIG","0123456789aAbBcCdDeEfF"),
-    CharacterSet::HTAB("HTAB","\t"),
-    CharacterSet::LF("LF","\n"),
-    CharacterSet::SP("SP"," "),
-    CharacterSet::VCHAR("VCHAR", 0x21, 0x7e),
-    // RFC 7230
-    CharacterSet::WSP("WSP"," \t"),
-    CharacterSet::CTEXT("ctext",{{0x09,0x09},{0x20,0x20},{0x2a,0x5b},{0x5d,0x7e},{0x80,0xff}}),
-    CharacterSet::TCHAR("TCHAR","!#$%&'*+-.^_`|~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-    CharacterSet::SPECIAL("SPECIAL","()<>@,;:\\\"/[]?={}"),
-    CharacterSet::QDTEXT("QDTEXT",{{0x09,0x09},{0x20,0x21},{0x23,0x5b},{0x5d,0x7e},{0x80,0xff}}),
-    CharacterSet::OBSTEXT("OBSTEXT",0x80,0xff),
-    // RFC 7232
-    CharacterSet::ETAGC("ETAGC",{{0x21,0x21},{0x23,0x7e},{0x80,0xff}}),
-    // RFC 7235
-    CharacterSet::TOKEN68C("TOKEN68C","-._~+/0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-    ;
+CharacterSet::ALPHA("ALPHA", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+             CharacterSet::BIT("BIT","01"),
+             CharacterSet::CR("CR","\r"),
+CharacterSet::CTL("CTL", {{0x01,0x1f},{0x7f,0x7f}}),
+CharacterSet::DIGIT("DIGIT","0123456789"),
+CharacterSet::DQUOTE("DQUOTE","\""),
+CharacterSet::HEXDIG("HEXDIG","0123456789aAbBcCdDeEfF"),
+CharacterSet::HTAB("HTAB","\t"),
+CharacterSet::LF("LF","\n"),
+CharacterSet::SP("SP"," "),
+CharacterSet::VCHAR("VCHAR", 0x21, 0x7e),
+// RFC 7230
+CharacterSet::WSP("WSP"," \t"),
+CharacterSet::CTEXT("ctext", {{0x09,0x09},{0x20,0x20},{0x2a,0x5b},{0x5d,0x7e},{0x80,0xff}}),
+CharacterSet::TCHAR("TCHAR","!#$%&'*+-.^_`|~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+CharacterSet::SPECIAL("SPECIAL","()<>@,;:\\\"/[]?={}"),
+CharacterSet::QDTEXT("QDTEXT", {{0x09,0x09},{0x20,0x21},{0x23,0x5b},{0x5d,0x7e},{0x80,0xff}}),
+CharacterSet::OBSTEXT("OBSTEXT",0x80,0xff),
+// RFC 7232
+CharacterSet::ETAGC("ETAGC", {{0x21,0x21},{0x23,0x7e},{0x80,0xff}}),
+// RFC 7235
+CharacterSet::TOKEN68C("TOKEN68C","-._~+/0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
+;
+
diff --git a/src/tests/testCharacterSet.cc b/src/tests/testCharacterSet.cc
index f146843e62..93c197cac6 100644
--- a/src/tests/testCharacterSet.cc
+++ b/src/tests/testCharacterSet.cc
@@ -101,8 +101,8 @@ testCharacterSet::CharacterSetEqualityOp()
     CPPUNIT_ASSERT_EQUAL(CharacterSet(nullptr,"01"), CharacterSet(nullptr,"01"));
     CPPUNIT_ASSERT_EQUAL(CharacterSet(nullptr,"01"), CharacterSet("","01"));
     CPPUNIT_ASSERT_EQUAL(CharacterSet::BIT, CharacterSet("bit",'0','1'));
-    CPPUNIT_ASSERT_EQUAL(CharacterSet::BIT, CharacterSet("bit",{{'0','1'}}));
-    CPPUNIT_ASSERT_EQUAL(CharacterSet::BIT, CharacterSet("bit",{{'0','0'},{'1','1'}}));
+    CPPUNIT_ASSERT_EQUAL(CharacterSet::BIT, CharacterSet("bit", {{'0','1'}}));
+    CPPUNIT_ASSERT_EQUAL(CharacterSet::BIT, CharacterSet("bit", {{'0','0'},{'1','1'}}));
 }
 
 void
@@ -120,3 +120,4 @@ testCharacterSet::CharacterSetSubtract()
     // one in set, one not; test operator-
     CPPUNIT_ASSERT_EQUAL(CharacterSet::HEXDIG, sample - CharacterSet(nullptr, "qz"));
 }
+