From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 20 May 2014 16:08:59 +0000 (-0700)
Subject: Polish namespace usage in .cc
X-Git-Tag: SQUID_3_5_0_1~217^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90bba30a10077b849cf12dfaaac42ed7c4c4dbe8;p=thirdparty%2Fsquid.git

Polish namespace usage in .cc
---

diff --git a/src/parser/Tokenizer.cc b/src/parser/Tokenizer.cc
index 87e5321d12..628efbfcb2 100644
--- a/src/parser/Tokenizer.cc
+++ b/src/parser/Tokenizer.cc
@@ -1,15 +1,13 @@
 #include "squid.h"
 #include "Tokenizer.h"
 
-namespace Parser {
-
 bool
-Tokenizer::token(SBuf &returnedToken, const CharacterSet &delimiters)
+Parser::Tokenizer::token(SBuf &returnedToken, const CharacterSet &delimiters)
 {
     SBuf savebuf(buf_);
     SBuf saveRetVal(returnedToken);
     skip(delimiters);
-    if (!(prefix(returnedToken,delimiters))) {
+    if (!prefix(returnedToken,delimiters)) {
         buf_=savebuf;
         returnedToken=saveRetVal;
         return false;
@@ -19,7 +17,7 @@ Tokenizer::token(SBuf &returnedToken, const CharacterSet &delimiters)
 }
 
 bool
-Tokenizer::prefix(SBuf &returnedToken, const CharacterSet &tokenChars, const SBuf::size_type limit)
+Parser::Tokenizer::prefix(SBuf &returnedToken, const CharacterSet &tokenChars, const SBuf::size_type limit)
 {
     SBuf::size_type prefixLen = buf_.substr(0,limit).findFirstNotOf(tokenChars);
     if (prefixLen == 0)
@@ -29,7 +27,7 @@ Tokenizer::prefix(SBuf &returnedToken, const CharacterSet &tokenChars, const SBu
 }
 
 bool
-Tokenizer::skip(const CharacterSet &tokenChars)
+Parser::Tokenizer::skip(const CharacterSet &tokenChars)
 {
     SBuf::size_type prefixLen = buf_.findFirstNotOf(tokenChars);
     if (prefixLen == 0)
@@ -39,7 +37,7 @@ Tokenizer::skip(const CharacterSet &tokenChars)
 }
 
 bool
-Tokenizer::skip(const SBuf &tokenToSkip)
+Parser::Tokenizer::skip(const SBuf &tokenToSkip)
 {
     if (buf_.startsWith(tokenToSkip)) {
         buf_.consume(tokenToSkip.length());
@@ -49,7 +47,7 @@ Tokenizer::skip(const SBuf &tokenToSkip)
 }
 
 bool
-Tokenizer::skip(const char tokenChar)
+Parser::Tokenizer::skip(const char tokenChar)
 {
     if (buf_[0] == tokenChar) {
         buf_.consume(1);
@@ -57,4 +55,3 @@ Tokenizer::skip(const char tokenChar)
     }
     return false;
 }
-} /* namespace Parser */
diff --git a/src/parser/Tokenizer.h b/src/parser/Tokenizer.h
index 47bf133be8..a2e6b7d5b9 100644
--- a/src/parser/Tokenizer.h
+++ b/src/parser/Tokenizer.h
@@ -4,9 +4,7 @@
 #include "base/CharacterSet.h"
 #include "SBuf.h"
 
-/**
- * Generic protocol-agnostic parsing tools
- */
+/// Generic protocol-agnostic parsing tools
 namespace Parser {
 
 /**