Rename checkNullVars into needCheckNullVars.

7 files changed, 48 insertions, 48 deletions

diff --git a/src/analysis/analysis.cpp b/src/analysis/analysis.cpp
index 45abe97..c863b53 100644
--- a/src/analysis/analysis.cpp
+++ b/src/analysis/analysis.cpp
@@ -62,21 +62,21 @@ namespace Analysis
 {
 
 // add variables null pointer checks
-void addCheckNullVars(WalkItem &wi, WalkItem &wo)
+void addNeedCheckNullVars(WalkItem &wi, WalkItem &wo)
 {
     FOR_EACH (std::set<std::string>::const_iterator, it, wi.addNullVars)
     {
-        wo.checkNullVars.insert(*it);
+        wo.needCheckNullVars.insert(*it);
         wo.knownVars.insert(*it);
     }
 }
 
 // remove one variable from null pointer checks
-void removeCheckNullVar(WalkItem &wi, std::string str)
+void removeNeedCheckNullVar(WalkItem &wi, std::string str)
 {
-    if (wi.checkNullVars.find(str) != wi.checkNullVars.end())
+    if (wi.needCheckNullVars.find(str) != wi.needCheckNullVars.end())
     {
-        wi.checkNullVars.erase(str);
+        wi.needCheckNullVars.erase(str);
     }
     if (wi.addNullVars.find(str) != wi.addNullVars.end())
     {
@@ -88,9 +88,9 @@ void removeCheckNullVar(WalkItem &wi, std::string str)
         const StringSet &linked = (*it2).second;
         FOR_EACH (StringSet::const_iterator, it3, linked)
         {
-            if (wi.checkNullVars.find(*it3) != wi.checkNullVars.end())
+            if (wi.needCheckNullVars.find(*it3) != wi.needCheckNullVars.end())
             {
-                wi.checkNullVars.erase(*it3);
+                wi.needCheckNullVars.erase(*it3);
             }
             if (wi.addNullVars.find(*it3) != wi.addNullVars.end())
             {
@@ -101,12 +101,12 @@ void removeCheckNullVar(WalkItem &wi, std::string str)
 }
 
 // remove vars from checks for null pointer
-void removeCheckNullVarsSet(WalkItem &wi, std::set<std::string> &vars)
+void removeNeedCheckNullVarsSet(WalkItem &wi, std::set<std::string> &vars)
 {
     FOR_EACH (std::set<std::string>::const_iterator, it, vars)
     {
         // remove var if need
-        removeCheckNullVar(wi, *it);
+        removeNeedCheckNullVar(wi, *it);
         // if need remove some linked var, search it parent,
         // and remove all linked vars for this parent
         StringMap::const_iterator it3 = wi.linkedReverseVars.find(*it);
@@ -114,7 +114,7 @@ void removeCheckNullVarsSet(WalkItem &wi, std::set<std::string> &vars)
         {
             const std::string parent = (*it3).second;
             //wi.linkedVars.erase(parent);
-            removeCheckNullVar(wi, parent);
+            removeNeedCheckNullVar(wi, parent);
         }
     }
 }
@@ -150,10 +150,10 @@ void walkTree(Node *node, const WalkItem &wi, WalkItem &wo)
     WalkItem wi2 = wi;
     // analyse node and after copy all properties from wo to wi2
     analyseNode(node, wi2, wo);
-    removeCheckNullVarsSet(wi2, wi2.removeNullVars);
-    addCheckNullVars(wo, wo);
-    addCheckNullVars(wo, wi2);
-    addCheckNullVars(wi2, wi2);
+    removeNeedCheckNullVarsSet(wi2, wi2.removeNullVars);
+    addNeedCheckNullVars(wo, wo);
+    addNeedCheckNullVars(wo, wi2);
+    addNeedCheckNullVars(wi2, wi2);
     wi2.linkedVars = wo.linkedVars;
     wi2.linkedReverseVars = wo.linkedReverseVars;
     wi2.addNullVars = wo.addNullVars;
@@ -176,8 +176,8 @@ void walkTree(Node *node, const WalkItem &wi, WalkItem &wo)
         walkTree(*it, wi2, wo2);
         wi2.removeNullVars = wo2.removeNullVars;
         wi2.addNullVars = wo2.addNullVars;
-        addCheckNullVars(wi2, wi2);
-        wo2.checkNullVars = wi2.checkNullVars;
+        addNeedCheckNullVars(wi2, wi2);
+        wo2.needCheckNullVars = wi2.needCheckNullVars;
         wo2.knownVars = wi2.knownVars;
         wi2.isReturned = wi2.isReturned || wo2.isReturned;
         wi2.linkedVars = wo2.linkedVars;
@@ -214,7 +214,7 @@ bool checkForReport(Node *node,
     node = skipNop(node);
     return node &&
         (node == PARM_DECL || node == VAR_DECL) &&
-        wi.checkNullVars.find(node->label) != wi.checkNullVars.end();
+        wi.needCheckNullVars.find(node->label) != wi.needCheckNullVars.end();
 }
 
 // report about useless check for null pointer
@@ -238,7 +238,7 @@ void reportParmDeclNullPointer(Node *mainNode,
         {
             if (node == PARM_DECL)
             {
-                if (wi.checkNullVars.find(node->label) != wi.checkNullVars.end())
+                if (wi.needCheckNullVars.find(node->label) != wi.needCheckNullVars.end())
                 {
                     Log::warn(findBackLocation(mainNode),
                         "Using parameter '%s' without checking for null pointer",
@@ -247,7 +247,7 @@ void reportParmDeclNullPointer(Node *mainNode,
             }
             else if (node == VAR_DECL)
             {
-                if (wi.checkNullVars.find(node->label) != wi.checkNullVars.end())
+                if (wi.needCheckNullVars.find(node->label) != wi.needCheckNullVars.end())
                 {
                     Log::warn(findBackLocation(mainNode),
                         "Using variable '%s' without checking for null pointer",
@@ -258,7 +258,7 @@ void reportParmDeclNullPointer(Node *mainNode,
         else if (node == COMPONENT_REF)
         {
             std::string var = getComponentRefVariable(node);
-            if (wi.checkNullVars.find(var) != wi.checkNullVars.end())
+            if (wi.needCheckNullVars.find(var) != wi.needCheckNullVars.end())
             {
                 Log::warn(findBackLocation(mainNode),
                     "Using field '%s' without checking for null pointer",
@@ -287,19 +287,19 @@ void reportParmDeclAttrNullPointer(Node *mainNode,
         {
             if (node == PARM_DECL)
             {
-                if (wi.checkNullVars.find(node->label) != wi.checkNullVars.end())
+                if (wi.needCheckNullVars.find(node->label) != wi.needCheckNullVars.end())
                     reportPossibleNullPointer(mainNode, node->label);
             }
             else if (node == VAR_DECL)
             {
-                if (wi.checkNullVars.find(node->label) != wi.checkNullVars.end())
+                if (wi.needCheckNullVars.find(node->label) != wi.needCheckNullVars.end())
                     reportPossibleNullPointer(mainNode, node->label);
             }
         }
         else if (node == COMPONENT_REF)
         {
             std::string var = getComponentRefVariable(node);
-            if (wi.checkNullVars.find(var) != wi.checkNullVars.end())
+            if (wi.needCheckNullVars.find(var) != wi.needCheckNullVars.end())
                 reportPossibleNullPointer(mainNode, node->label);
         }
     }
@@ -380,7 +380,7 @@ void analyseNode(Node *node, const WalkItem &wi, WalkItem &wo)
             node->label.c_str());
         FOR_EACH (std::set<std::string>::const_iterator,
                   it,
-                  wi.checkNullVars)
+                  wi.needCheckNullVars)
         {
             Log::log("%s, ", (*it).c_str());
         }
@@ -398,7 +398,7 @@ void analyseNode(Node *node, const WalkItem &wi, WalkItem &wo)
     // Except IF_STMT. Removing handled inside analyse function.
     if (node != IF_STMT)
     {
-        removeCheckNullVarsSet(wi2, wi2.removeNullVars);
+        removeNeedCheckNullVarsSet(wi2, wi2.removeNullVars);
     }
 
     if (command != Command::DumpNullPointers)
diff --git a/src/analysis/analysis.h b/src/analysis/analysis.h
index 0c4e10f..4b3ee28 100644
--- a/src/analysis/analysis.h
+++ b/src/analysis/analysis.h
@@ -56,10 +56,10 @@ namespace Analysis
                       const std::string &parent,
                       const std::string &var);
 
-    void removeCheckNullVar(WalkItem &wi, std::string str);
+    void removeNeedCheckNullVar(WalkItem &wi, std::string str);
 
-    void removeCheckNullVarsSet(WalkItem &wi,
-                                std::set<std::string> &vars);
+    void removeNeedCheckNullVarsSet(WalkItem &wi,
+                                    std::set<std::string> &vars);
 
     Node *skipNop(Node *node);
 
diff --git a/src/analysis/expression.cpp b/src/analysis/expression.cpp
index 4683dee..e920a50 100644
--- a/src/analysis/expression.cpp
+++ b/src/analysis/expression.cpp
@@ -124,7 +124,7 @@ void analyseModifyExpr(ModifyExprNode *node, const WalkItem &wi, WalkItem &wo)
             std::string var2 = getVariableName(node->args[1]);
             if (!var1.empty() && !var2.empty())
             {
-                if (wi.checkNullVars.find(var2) != wi.checkNullVars.end())
+                if (wi.needCheckNullVars.find(var2) != wi.needCheckNullVars.end())
                 {
                     wo.addNullVars.insert(var1);
                     addLinkedVar(wo, var2, var1);
@@ -195,7 +195,7 @@ void analyseNeExpr(NeExprNode *node, const WalkItem &wi, WalkItem &wo)
         node2 == INTEGER_CST &&
         node2->label == "0")
     {
-        if (wi.checkNullVars.find(var) != wi.checkNullVars.end())
+        if (wi.needCheckNullVars.find(var) != wi.needCheckNullVars.end())
         {
             wo.checkedNonNullVars.insert(var);
             wo.cleanExpr = true;
@@ -227,7 +227,7 @@ void analyseEqExpr(EqExprNode *node, const WalkItem &wi, WalkItem &wo)
         node2 == INTEGER_CST &&
         node2->label == "0")
     {
-        if (wi.checkNullVars.find(var) != wi.checkNullVars.end())
+        if (wi.needCheckNullVars.find(var) != wi.needCheckNullVars.end())
         {
             wo.checkedNullVars.insert(var);
             wo.cleanExpr = true;
@@ -246,8 +246,8 @@ void analyseOrCondition(Node *node, Node *node1, Node *node2, const WalkItem &wi
     walkTree(node1, wi, wo1);
     Log::dumpWI(node, "wo1 ", wo1);
     WalkItem wi2 = wi;
-    removeCheckNullVarsSet(wi2, wo1.checkedNullVars);
-    wi2.checkNullVars.insert(wo1.checkedNonNullVars.begin(),
+    removeNeedCheckNullVarsSet(wi2, wo1.checkedNullVars);
+    wi2.needCheckNullVars.insert(wo1.checkedNonNullVars.begin(),
         wo1.checkedNonNullVars.end());
     wi2.knownVars.insert(wo1.checkedNonNullVars.begin(),
         wo1.checkedNonNullVars.end());
@@ -275,8 +275,8 @@ void analyseAndCondition(Node *node, Node *node1, Node *node2, const WalkItem &w
     walkTree(node1, wi, wo1);
     Log::dumpWI(node, "wo1 ", wo1);
     WalkItem wi2 = wi;
-    removeCheckNullVarsSet(wi2, wo1.checkedNonNullVars);
-    wi2.checkNullVars.insert(wo1.checkedNullVars.begin(),
+    removeNeedCheckNullVarsSet(wi2, wo1.checkedNonNullVars);
+    wi2.needCheckNullVars.insert(wo1.checkedNullVars.begin(),
         wo1.checkedNullVars.end());
     wi2.knownVars.insert(wo1.checkedNullVars.begin(),
         wo1.checkedNullVars.end());
@@ -575,7 +575,7 @@ void analyseInitExpr(InitExprNode* node,
     std::string var2 = getVariableName(node->args[1]);
     if (var1.empty() || var2.empty())
         return;
-    if (wi.checkNullVars.find(var2) == wi.checkNullVars.end())
+    if (wi.needCheckNullVars.find(var2) == wi.needCheckNullVars.end())
         return;
     wo.addNullVars.insert(var1);
     addLinkedVar(wo, var2, var1);
diff --git a/src/analysis/function.cpp b/src/analysis/function.cpp
index 20ead8f..a9053b7 100644
--- a/src/analysis/function.cpp
+++ b/src/analysis/function.cpp
@@ -125,7 +125,7 @@ void getPossibleNullParameters(FunctionDeclNode *node, WalkItem &wi)
                     type->nodeTypeName.c_str(),
                     name->label.c_str());
             }
-            wi.checkNullVars.insert(name->label);
+            wi.needCheckNullVars.insert(name->label);
             wi.knownVars.insert(name->label);
         }
     }
diff --git a/src/analysis/statement.cpp b/src/analysis/statement.cpp
index 08bb4db..d1f75b9 100644
--- a/src/analysis/statement.cpp
+++ b/src/analysis/statement.cpp
@@ -60,8 +60,8 @@ void analyseCondition(Node *node,
     Log::dumpWI(node, "wco ", wco);
 
     WalkItem wi2 = wi;
-    removeCheckNullVarsSet(wi2, wco.checkedNonNullVars);
-    wi2.checkNullVars.insert(wco.checkedNullVars.begin(),
+    removeNeedCheckNullVarsSet(wi2, wco.checkedNonNullVars);
+    wi2.needCheckNullVars.insert(wco.checkedNullVars.begin(),
         wco.checkedNullVars.end());
     wi2.knownVars.insert(wco.checkedNullVars.begin(),
         wco.checkedNullVars.end());
@@ -74,8 +74,8 @@ void analyseCondition(Node *node,
     Log::dumpWI(node, "wo2 then ", wo2);
 
     WalkItem wi3 = wi;
-    removeCheckNullVarsSet(wi3, wco.checkedNullVars);
-    wi3.checkNullVars.insert(wco.checkedNonNullVars.begin(),
+    removeNeedCheckNullVarsSet(wi3, wco.checkedNullVars);
+    wi3.needCheckNullVars.insert(wco.checkedNonNullVars.begin(),
         wco.checkedNonNullVars.end());
     wi3.knownVars.insert(wco.checkedNonNullVars.begin(),
         wco.checkedNonNullVars.end());
@@ -104,7 +104,7 @@ void analyseCondition(Node *node,
                   wco.checkedNullVars)
         {
             wo.removeNullVars.insert(*it);
-            removeCheckNullVar(wo, *it);
+            removeNeedCheckNullVar(wo, *it);
         }
     }
     if (wo3.isReturned)
@@ -115,7 +115,7 @@ void analyseCondition(Node *node,
                   wco.checkedNonNullVars)
         {
             wo.removeNullVars.insert(*it);
-            removeCheckNullVar(wo, *it);
+            removeNeedCheckNullVar(wo, *it);
         }
     }
 
@@ -124,7 +124,7 @@ void analyseCondition(Node *node,
         // add variable for ignore for all parent nodes except special like IF_STMT
         FOR_EACH (std::set<std::string>::const_iterator,
                   it,
-                  wo.checkNullVars)
+                  wo.needCheckNullVars)
         {
             wo.removeNullVars.insert(*it);
         }
diff --git a/src/analysis/walkitem.h b/src/analysis/walkitem.h
index dc69151..8fc52b6 100644
--- a/src/analysis/walkitem.h
+++ b/src/analysis/walkitem.h
@@ -31,7 +31,7 @@ typedef std::map<std::string, std::string> StringMap;
 struct WalkItem
 {
     WalkItem() :
-        checkNullVars(),
+        needCheckNullVars(),
         knownVars(),
         removeNullVars(),
         addNullVars(),
@@ -47,7 +47,7 @@ struct WalkItem
     }
 
     WalkItem(const WalkItem &item) :
-        checkNullVars(item.checkNullVars),
+        needCheckNullVars(item.needCheckNullVars),
         knownVars(item.knownVars),
         removeNullVars(item.removeNullVars),
         addNullVars(item.addNullVars),
@@ -62,7 +62,7 @@ struct WalkItem
     {
     }
 
-    StringSet checkNullVars;       // need check for usage without null pointer check
+    StringSet needCheckNullVars;   // need check for usage without null pointer check
     StringSet knownVars;           // vars already checked for null pointer
     StringSet removeNullVars;      // need remove vars from parent checkNullVars
     StringSet addNullVars;         // need add vars to parent checkNullVars
diff --git a/src/logger.cpp b/src/logger.cpp
index 692c462..4bd8efd 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -222,7 +222,7 @@ void dumpWI(Node *const node,
         Log::log(" returned");
     dumpWIProps(" checkedNullVars:", wi.checkedNullVars)
     dumpWIProps(" checkedNonNullVars:", wi.checkedNonNullVars)
-    dumpWIProps(" checkNullVars:", wi.checkNullVars)
+    dumpWIProps(" needCheckNullVars:", wi.needCheckNullVars)
     dumpWIProps(" knownVars:", wi.knownVars)
     dumpWIProps(" removeNullVars:", wi.removeNullVars)
     dumpWIProps(" addNullVars:", wi.addNullVars)