From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 23 Feb 2017 11:11:13 +0000 (+1300)
Subject: Cleanup: convert class SBufStats to C++11 initialization
X-Git-Tag: M-staged-PR71~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=146102623fa218e0069ccc0f6b4b91eb2b71f5bd;p=thirdparty%2Fsquid.git

Cleanup: convert class SBufStats to C++11 initialization

 ... and to Squid coding style layout.

This also resolves uninitialized variable in pinger issue detected by
Coverity Scan. Issue 1228696.
---

diff --git a/src/sbuf/Stats.cc b/src/sbuf/Stats.cc
index 63562373e4..7d20ab024a 100644
--- a/src/sbuf/Stats.cc
+++ b/src/sbuf/Stats.cc
@@ -13,14 +13,6 @@
 
 #include <iostream>
 
-SBufStats::SBufStats()
-    : alloc(0), allocCopy(0), allocFromCString(0),
-      assignFast(0), clear(0), append(0), moves(0), toStream(0), setChar(0),
-      getChar(0), compareSlow(0), compareFast(0), copyOut(0),
-      rawAccess(0), nulTerminate(0), chop(0), trim(0), find(0),
-      caseChange(0), cowFast(0), cowSlow(0), live(0)
-{}
-
 SBufStats&
 SBufStats::operator +=(const SBufStats& ss)
 {
diff --git a/src/sbuf/Stats.h b/src/sbuf/Stats.h
index 00b76f0479..7c280a5883 100644
--- a/src/sbuf/Stats.h
+++ b/src/sbuf/Stats.h
@@ -21,34 +21,34 @@
 class SBufStats
 {
 public:
-    uint64_t alloc; ///<number of calls to SBuf constructors
-    uint64_t allocCopy; ///<number of calls to SBuf copy-constructor
-    uint64_t allocFromCString; ///<number of copy-allocations from c-strings
-    uint64_t assignFast; ///<number of no-copy assignment operations
-    uint64_t clear; ///<number of clear operations
-    uint64_t append; ///<number of append operations
-    uint64_t moves; ///<number of move constructions/assignments
-    uint64_t toStream;  ///<number of write operations to ostreams
-    uint64_t setChar; ///<number of calls to setAt
-    uint64_t getChar; ///<number of calls to at() and operator[]
-    uint64_t compareSlow; ///<number of comparison operations requiring data scan
-    uint64_t compareFast; ///<number of comparison operations not requiring data scan
-    uint64_t copyOut; ///<number of data-copies to other forms of buffers
-    uint64_t rawAccess; ///<number of accesses to raw contents
-    uint64_t nulTerminate; ///<number of c_str() terminations
-    uint64_t chop;  ///<number of chop operations
-    uint64_t trim;  ///<number of trim operations
-    uint64_t find;  ///<number of find operations
-    uint64_t caseChange; ///<number of toUpper and toLower operations
-    uint64_t cowFast; ///<number of cow operations not actually requiring a copy
-    uint64_t cowSlow; ///<number of cow operations requiring a copy
-    uint64_t live;  ///<number of currently-allocated SBuf
-
     ///Dump statistics to an ostream.
     std::ostream& dump(std::ostream &os) const;
-    SBufStats();
 
     SBufStats& operator +=(const SBufStats&);
+
+public:
+    uint64_t alloc = 0; ///<number of calls to SBuf constructors
+    uint64_t allocCopy = 0; ///<number of calls to SBuf copy-constructor
+    uint64_t allocFromCString = 0; ///<number of copy-allocations from c-strings
+    uint64_t assignFast = 0; ///<number of no-copy assignment operations
+    uint64_t clear = 0; ///<number of clear operations
+    uint64_t append = 0; ///<number of append operations
+    uint64_t moves = 0; ///<number of move constructions/assignments
+    uint64_t toStream = 0;  ///<number of write operations to ostreams
+    uint64_t setChar = 0; ///<number of calls to setAt
+    uint64_t getChar = 0; ///<number of calls to at() and operator[]
+    uint64_t compareSlow = 0; ///<number of comparison operations requiring data scan
+    uint64_t compareFast = 0; ///<number of comparison operations not requiring data scan
+    uint64_t copyOut = 0; ///<number of data-copies to other forms of buffers
+    uint64_t rawAccess = 0; ///<number of accesses to raw contents
+    uint64_t nulTerminate = 0; ///<number of c_str() terminations
+    uint64_t chop = 0;  ///<number of chop operations
+    uint64_t trim = 0;  ///<number of trim operations
+    uint64_t find = 0;  ///<number of find operations
+    uint64_t caseChange = 0; ///<number of toUpper and toLower operations
+    uint64_t cowFast = 0; ///<number of cow operations not actually requiring a copy
+    uint64_t cowSlow = 0; ///<number of cow operations requiring a copy
+    uint64_t live = 0;  ///<number of currently-allocated SBuf
 };
 
 #endif /* SQUID_SBUF_STATS_H */
diff --git a/src/tests/stub_SBuf.cc b/src/tests/stub_SBuf.cc
index e0904fad6c..d1bca7d84a 100644
--- a/src/tests/stub_SBuf.cc
+++ b/src/tests/stub_SBuf.cc
@@ -19,7 +19,6 @@ SBufStats SBuf::stats;
 const SBuf::size_type SBuf::npos;
 const SBuf::size_type SBuf::maxSize;
 
-SBufStats::SBufStats() {}
 std::ostream& SBufStats::dump(std::ostream &os) const STUB_RETVAL(os)
 SBufStats& SBufStats::operator +=(const SBufStats&) STUB_RETVAL(*this)