Extract some code from analyseFunctionDecl.

1 files changed, 16 insertions, 12 deletions

diff --git a/src/analysis/function.cpp b/src/analysis/function.cpp
index 70b4389..ff0f186 100644
--- a/src/analysis/function.cpp
+++ b/src/analysis/function.cpp
@@ -95,18 +95,10 @@ void getFunctionParamsNonNullAttributes(FunctionDeclNode *node,
     }
 }
 
-void analyseFunction(FunctionDeclNode *node, const WalkItem &wi, WalkItem &wo)
+void getPossibleNullParameters(FunctionDeclNode *node, WalkItem &wi)
 {
-    // ignore external functions
-    if (node->isExternal)
-    {
-        wo.stopWalking = true;
-        return;
-    }
-
     std::vector<TypeNode*> types;
     std::set<int> nonNull;
-    WalkItem wi2 = wi;
 
     getFunctionArgTypes(node, types);
     getFunctionParamsNonNullAttributes(node, nonNull);
@@ -133,17 +125,29 @@ void analyseFunction(FunctionDeclNode *node, const WalkItem &wi, WalkItem &wo)
                     type->nodeTypeName.c_str(),
                     name->label.c_str());
             }
-            wi2.checkNullVars.insert(name->label);
+            wi.checkNullVars.insert(name->label);
         }
     }
     if (command == Command::FindArgs)
         Log::log("\n");
+}
 
-    if (!wi2.checkNullVars.empty())
+void analyseFunction(FunctionDeclNode *node, const WalkItem &wi, WalkItem &wo)
+{
+    // ignore external functions
+    if (node->isExternal)
     {
+        wo.stopWalking = true;
+        return;
+    }
+
+    if (node->code)
+    {   // probably function definition
+        WalkItem wi2 = wi;
+        getPossibleNullParameters(node, wi2);
         walkTree(node->code, wi2, wo);
+        wo.stopWalking = true;
     }
-    wo.stopWalking = true;
 }
 
 }