From 9f5a4c9b2257912a1835b0ff9149ed53bc4cdcfd Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Thu, 14 Jun 2018 19:04:52 -0400
Subject: [PATCH] Fix cppcheck warnings. No functional change intended.

---
 include/verilated_unordered_set_map.h | 2 +-
 src/V3AstNodes.h                      | 2 +-
 src/V3Case.cpp                        | 7 ++++++-
 src/V3Clean.cpp                       | 1 +
 src/V3Combine.cpp                     | 7 +++++--
 src/V3LifePost.cpp                    | 3 ++-
 src/V3Name.cpp                        | 1 +
 src/V3Premit.cpp                      | 1 +
 src/V3SplitAs.cpp                     | 2 ++
 9 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/include/verilated_unordered_set_map.h b/include/verilated_unordered_set_map.h
index 15e823a5c..59b13c4ac 100644
--- a/include/verilated_unordered_set_map.h
+++ b/include/verilated_unordered_set_map.h
@@ -409,7 +409,7 @@ template <class Key,
         Equal key_eq;
     public:
         KeyEqual() {}
-        bool operator()(const value_type& kv_a, const value_type kv_b) const {
+        bool operator()(const value_type& kv_a, const value_type& kv_b) const {
             return key_eq.operator()(kv_a.first, kv_b.first);
         }
     };
diff --git a/src/V3AstNodes.h b/src/V3AstNodes.h
index 327374a93..c92976f9c 100644
--- a/src/V3AstNodes.h
+++ b/src/V3AstNodes.h
@@ -5694,7 +5694,7 @@ public:
 class AstSplitPlaceholder : public AstNode {
 public:
     // Dummy node used within V3Split; never exists outside of V3Split.
-    AstSplitPlaceholder(FileLine* filelinep)
+    explicit AstSplitPlaceholder(FileLine* filelinep)
         : AstNode(filelinep) {}
     ASTNODE_NODE_FUNCS(SplitPlaceholder)
 };
diff --git a/src/V3Case.cpp b/src/V3Case.cpp
index d2c6939c7..29fc58ac9 100644
--- a/src/V3Case.cpp
+++ b/src/V3Case.cpp
@@ -207,7 +207,7 @@ private:
 	if (m_caseItems <= 3) return false;	// Not worth simplifing
 	// Convert valueItem from AstCaseItem* to the expression
 	// Not done earlier, as we may now have a NULL because it's just a ";" NOP branch
-	for (uint32_t i=0; i<(1UL<<m_caseWidth); i++) {
+        for (uint32_t i=0; i<(1UL<<m_caseWidth); ++i) {
             m_valueItem[i] = VN_CAST(m_valueItem[i], CaseItem)->bodysp();
 	}
 	return true;  // All is fine
@@ -467,7 +467,12 @@ private:
 public:
     // CONSTUCTORS
     explicit CaseVisitor(AstNetlist* nodep) {
+        m_caseWidth = 0;
+        m_caseItems = 0;
 	m_caseNoOverlapsAllCovered = false;
+        for (uint32_t i=0; i<(1UL<<CASE_OVERLAP_WIDTH); ++i) {
+            m_valueItem[i] = NULL;
+        }
         iterate(nodep);
     }
     virtual ~CaseVisitor() {
diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp
index 0e5832a3b..8ff26a0ae 100644
--- a/src/V3Clean.cpp
+++ b/src/V3Clean.cpp
@@ -283,6 +283,7 @@ private:
 public:
     // CONSTUCTORS
     explicit CleanVisitor(AstNetlist* nodep) {
+        m_modp = NULL;
         iterate(nodep);
     }
     virtual ~CleanVisitor() {}
diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp
index ca6e4c5ff..5f2e4bea0 100644
--- a/src/V3Combine.cpp
+++ b/src/V3Combine.cpp
@@ -454,9 +454,12 @@ private:
 public:
     // CONSTUCTORS
     explicit CombineVisitor(AstNetlist* nodep) {
-	m_modp=NULL;
-	m_funcp = NULL;
 	m_state = STATE_IDLE;
+        m_modp = NULL;
+        m_funcp = NULL;
+        m_modNFuncs = 0;
+        m_walkLast1p = NULL;
+        m_walkLast2p = NULL;
         iterate(nodep);
     }
     virtual ~CombineVisitor() {
diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp
index 29e146a83..cdc9042e1 100644
--- a/src/V3LifePost.cpp
+++ b/src/V3LifePost.cpp
@@ -210,7 +210,8 @@ private:
 public:
     // CONSTRUCTORS
     explicit LifePostDlyVisitor(AstNetlist* nodep)
-        : m_tracingCall(false) {
+        : m_sequence(0)
+        , m_tracingCall(false) {
         iterate(nodep);
     }
     virtual ~LifePostDlyVisitor() {
diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index 85f41c6e6..5a8dafa7a 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -134,6 +134,7 @@ private:
 public:
     // CONSTUCTORS
     explicit NameVisitor(AstNetlist* nodep) {
+        m_modp = NULL;
         iterate(nodep);
     }
     virtual ~NameVisitor() {}
diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp
index 49b298f34..47d8fd4b8 100644
--- a/src/V3Premit.cpp
+++ b/src/V3Premit.cpp
@@ -406,6 +406,7 @@ public:
 	m_stmtp = NULL;
 	m_inWhilep = NULL;
 	m_inTracep = NULL;
+        m_assignLhs = false;
         iterate(nodep);
     }
     virtual ~PremitVisitor() {}
diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp
index ce703b789..c5cf5bdd3 100644
--- a/src/V3SplitAs.cpp
+++ b/src/V3SplitAs.cpp
@@ -126,6 +126,8 @@ public:
     SplitAsCleanVisitor(AstAlways* nodep, AstVarScope* vscp, bool modeMatch) {
 	m_splitVscp = vscp;
 	m_modeMatch = modeMatch;
+        m_keepStmt =  false;
+        m_matches = false;
         iterate(nodep);
     }
     virtual ~SplitAsCleanVisitor() {}