From c95142e63612d66453dab9d6893637cdccfa110d Mon Sep 17 00:00:00 2001 From: Automatic source maintenance Date: Sat, 28 Sep 2013 18:47:35 -0600 Subject: [PATCH] SourceFormat Enforcement --- src/ConfigParser.cc | 7 ++----- src/ConfigParser.h | 1 - src/acl/Data.h | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc index 58ac392fcd..12214aa2d1 100644 --- a/src/ConfigParser.cc +++ b/src/ConfigParser.cc @@ -41,7 +41,6 @@ char *ConfigParser::lastToken = NULL; std::queue ConfigParser::undo; - int ConfigParser::RecognizeQuotedValues = true; void @@ -68,16 +67,15 @@ ConfigParser::strtokFilePutBack(const char *tok) char * xstrtok(char *str, const char *delimiters) -{ +{ assert(!str); // we are parsing the configuration file // no support unless enabled in the configuration and // no support for other delimiters (they may need to be eradicated!) return (ConfigParser::RecognizeQuotedValues && strcmp(delimiters, " \t\n\r") == 0) ? - ConfigParser::NextToken() : ::strtok(str, delimiters); + ConfigParser::NextToken() : ::strtok(str, delimiters); } - char * ConfigParser::strtokFile(void) { @@ -244,7 +242,6 @@ ConfigParser::NextToken() return NextElement(NULL); } - const char * ConfigParser::QuoteString(const String &var) { diff --git a/src/ConfigParser.h b/src/ConfigParser.h index 8d2e728d2e..c6049b7faf 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -109,5 +109,4 @@ int parseConfigFile(const char *file_name); /// without replacing every strtok() call. extern char *xstrtok(char *str, const char *delimiters); - #endif /* SQUID_CONFIGPARSER_H */ diff --git a/src/acl/Data.h b/src/acl/Data.h index 342a15b3a2..ec487f548e 100644 --- a/src/acl/Data.h +++ b/src/acl/Data.h @@ -35,7 +35,6 @@ class wordlist; extern char *xstrtok(char *str, const char *delimiters); - /// \ingroup ACLAPI template class ACLData @@ -53,7 +52,6 @@ public: virtual bool empty() const =0; - /// XXX: Temporary hack to allow old ACL code to handle quoted values without /// replacing every strtok() call. char *strtok(char *str, const char *dels) { return xstrtok(str, dels); } -- 2.47.2