Bug 3648: Polish String class files

Fix to correct function parameter const correctness.

Also polishes whitespace to match Squid coding guidelines.

diff --git a/src/SquidString.h b/src/SquidString.h
index 929fd4ffa0cb8dfe0c5b84b1b2d6813883b33cce..35bbdb2b025d740ba15f3ae8547fa69566bc81b9 100644 (file)
--- a/src/SquidString.h
+++ b/src/SquidString.h
@@ -58,13 +58,11 @@ class StringRegistry
 public:
     static StringRegistry &Instance();
 
-    void add
-    (String const *);
+    void add(String const *);
 
     StringRegistry();
 
-    void remove
-    (String const *);
+    void remove(String const *);
 
 private:
     static OBJH Stat;
@@ -87,8 +85,8 @@ class String
 
 public:
     _SQUID_INLINE_ String();
-    String (char const *);
-    String (String const &);
+    String(char const *);
+    String(String const &);
     ~String();
 
     typedef size_t size_type; //storage size intentionally unspecified
@@ -134,7 +132,7 @@ public:
     void append(char const *buf, int len);
     void append(char const *buf);
     void append(char const);
-    void append (String const &);
+    void append(String const &);
     void absorb(String &old);
     const char * pos(char const *aString) const;
     const char * pos(char const ch) const;
@@ -144,19 +142,19 @@ public:
     size_type find(char const *aString) const;
     const char * rpos(char const ch) const;
     size_type rfind(char const ch) const;
-    _SQUID_INLINE_ int cmp (char const *) const;
-    _SQUID_INLINE_ int cmp (char const *, size_type count) const;
-    _SQUID_INLINE_ int cmp (String const &) const;
-    _SQUID_INLINE_ int caseCmp (char const *) const;
-    _SQUID_INLINE_ int caseCmp (char const *, size_type count) const;
-    _SQUID_INLINE_ int caseCmp (String const &) const;
+    _SQUID_INLINE_ int cmp(char const *) const;
+    _SQUID_INLINE_ int cmp(char const *, size_type count) const;
+    _SQUID_INLINE_ int cmp(String const &) const;
+    _SQUID_INLINE_ int caseCmp(char const *) const;
+    _SQUID_INLINE_ int caseCmp(char const *, size_type count) const;
+    _SQUID_INLINE_ int caseCmp(String const &) const;
 
     String substr(size_type from, size_type to) const;
 
     _SQUID_INLINE_ void cut(size_type newLength);
 
 #if DEBUGSTRINGS
-    void stat (StoreEntry *) const;
+    void stat(StoreEntry *) const;
 #endif
 
 

diff --git a/src/String.cc b/src/String.cc
index ca16de82aa7f5e767440a970fb4d69952facc68d..9b0b645879a708cd766de1e72bee51d904498864 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -69,7 +69,7 @@ String::setBuffer(char *aBuf, String::size_type aSize)
     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));
@@ -87,7 +87,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)
@@ -96,7 +96,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;
@@ -105,7 +105,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;
@@ -135,7 +135,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());
@@ -173,7 +173,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
@@ -183,7 +183,7 @@ 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);
@@ -215,23 +215,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

diff --git a/src/String.cci b/src/String.cci
index 2bc3f8f4184a08ec937d5a67247e4ebfc3bc6e33..6d1045d41c71e1818313201c3ceb1cf878321fa2 100644 (file)
--- a/src/String.cci
+++ b/src/String.cci
@@ -42,8 +42,7 @@
 #endif /* INT_MAX */
 #endif /* HAVE_STDINT_H */
 
-
-String::String() : size_(0), len_(0), buf_ (NULL)
+String::String() : size_(0), len_(0), buf_(NULL)
 {
 #if DEBUGSTRINGS
     StringRegistry::Instance().add(this);
@@ -107,7 +106,7 @@ String::nilCmp(const bool thisIsNilOrEmpty, const bool otherIsNilOrEmpty, int &r
 
 
 int
-String::cmp (char const *aString) const
+String::cmp(char const *aString) const
 {
     int result = 0;
     if (nilCmp(!size(), (!aString || !*aString), result))
@@ -117,7 +116,7 @@ String::cmp (char const *aString) const
 }
 
 int
-String::cmp (char const *aString, String::size_type count) const
+String::cmp(char const *aString, String::size_type count) const
 {
     int result = 0;
     if (nilCmp((!size() || !count), (!aString || !*aString || !count), result))
@@ -127,7 +126,7 @@ String::cmp (char const *aString, String::size_type count) const
 }
 
 int
-String::cmp (String const &aString) const
+String::cmp(String const &aString) const
 {
     int result = 0;
     if (nilCmp(!size(), !aString.size(), result))