SourceFormat Enforcement

[thirdparty/squid.git] / src / String.cc

diff --git a/src/String.cc b/src/String.cc
index e6eed41f39b70c9be3e605cac747b97bb3865154..dda09156021020cd59d902fa212b3647b557e893 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -1,49 +1,20 @@
-
 /*
- * $Id$
- *
- * DEBUG: section 67    String
- * AUTHOR: Duane Wessels
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: section 67    String */
+
 #include "squid.h"
 #include "base/TextException.h"
-#include "Mem.h"
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
-#include "protos.h"
 #include "Store.h"
 
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
+#include <climits>
 
 int
 String::psize() const
@@ -70,12 +41,12 @@ void
 String::setBuffer(char *aBuf, String::size_type aSize)
 {
     assert(undefined());
-    assert(aSize < 65536);
+    assert(aSize <= SizeMax_);
     buf_ = aBuf;
     size_ = aSize;
 }
 
-String::String (char const *aString) : size_(0), len_(0), buf_(NULL)
+String::String(char const *aString) : size_(0), len_(0), buf_(NULL)
 {
     if (aString)
         allocAndFill(aString, strlen(aString));
@@ -93,7 +64,7 @@ String::operator =(char const *aString)
 }
 
 String &
-String::operator = (String const &old)
+String::operator =(String const &old)
 {
     clean(); // TODO: optimize to avoid cleaning the buffer we can use
     if (old.size() > 0)
@@ -102,7 +73,7 @@ String::operator = (String const &old)
 }
 
 bool
-String::operator == (String const &that) const
+String::operator ==(String const &that) const
 {
     if (0 == this->cmp(that))
         return true;
@@ -111,7 +82,7 @@ String::operator == (String const &that) const
 }
 
 bool
-String::operator != (String const &that) const
+String::operator !=(String const &that) const
 {
     if (0 == this->cmp(that))
         return false;
@@ -133,7 +104,7 @@ void
 String::allocAndFill(const char *str, int len)
 {
     PROF_start(StringAllocAndFill);
-    assert(this && str);
+    assert(str);
     allocBuffer(len + 1);
     len_ = len;
     memcpy(buf_, str, len);
@@ -141,7 +112,7 @@ String::allocAndFill(const char *str, int len)
     PROF_stop(StringAllocAndFill);
 }
 
-String::String (String const &old) : size_(0), len_(0), buf_(NULL)
+String::String(String const &old) : size_(0), len_(0), buf_(NULL)
 {
     if (old.size() > 0)
         allocAndFill(old.rawBuf(), old.size());
@@ -155,7 +126,6 @@ void
 String::clean()
 {
     PROF_start(StringClean);
-    assert(this);
 
     /* TODO if mempools has already closed this will FAIL!! */
     if (defined())
@@ -179,7 +149,7 @@ String::~String()
 }
 
 void
-String::reset(const char *str)
+String::reset(char const *str)
 {
     PROF_start(StringReset);
     clean(); // TODO: optimize to avoid cleaning the buffer if we can reuse it
@@ -189,9 +159,8 @@ String::reset(const char *str)
 }
 
 void
-String::append(const char *str, int len)
+String::append( char const *str, int len)
 {
-    assert(this);
     assert(str && len >= 0);
 
     PROF_start(StringAppend);
@@ -201,7 +170,7 @@ String::append(const char *str, int len)
     } else {
         // Create a temporary string and absorb it later.
         String snew;
-        assert(len_ + len < 65536); // otherwise snew.len_ overflows below
+        assert(canGrowBy(len)); // otherwise snew.len_ may overflow below
         snew.len_ = len_ + len;
         snew.allocBuffer(snew.len_ + 1);
 
@@ -221,23 +190,23 @@ String::append(const char *str, int len)
 void
 String::append(char const *str)
 {
-    assert (str);
-    append (str, strlen(str));
+    assert(str);
+    append(str, strlen(str));
 }
 
 void
-String::append (char chr)
+String::append(char const chr)
 {
     char myString[2];
     myString[0]=chr;
     myString[1]='\0';
-    append (myString, 1);
+    append(myString, 1);
 }
 
 void
 String::append(String const &old)
 {
-    append (old.rawBuf(), old.len_);
+    append(old.rawBuf(), old.len_);
 }
 
 void
@@ -306,7 +275,7 @@ StringRegistry::remove(String const *entry)
 
 StringRegistry StringRegistry::Instance_;
 
-extern String::size_type memStringCount();
+String::size_type memStringCount();
 
 void
 StringRegistry::Stat(StoreEntry *entry)
@@ -379,7 +348,8 @@ strwordtok(char *buf, char **t)
         switch (ch) {
 
         case '\\':
-            ++p;
+            if (quoted)
+                ++p;
 
             switch (*p) {
 
@@ -499,3 +469,4 @@ String::rfind(char const ch) const
 #if !_USE_INLINE_
 #include "String.cci"
 #endif
+