Merge pull request #10736 from NREL/CppCheck-InternalHeatGains

CppCheck InternalHeatGains
NREL · Sep 13, 2024 · ba8a8b9 · ba8a8b9 · nrel-bot-2 · Sep 13, 2024
2 parents 1da7008 + c41c753
commit ba8a8b9
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 91 deletions.
diff --git a/src/EnergyPlus/InputProcessing/IdfParser.cc b/src/EnergyPlus/InputProcessing/IdfParser.cc
@@ -659,14 +659,13 @@ std::string IdfParser::parse_string(std::string_view idf, size_t &index)
     eat_whitespace(idf, index);
 
     std::string str;
-    char c;
 
     while (true) {
         if (index == idf_size) {
             break;
         }
 
-        c = idf[index];
+        char c = idf[index];
         increment_both_index(index, index_into_cur_line);
         if (c == ',' || c == ';' || c == '!') {
             decrement_both_index(index, index_into_cur_line);

diff --git a/src/EnergyPlus/InputProcessing/InputProcessor.cc b/src/EnergyPlus/InputProcessing/InputProcessor.cc
@@ -1064,9 +1064,9 @@ void InputProcessor::getObjectItem(EnergyPlusData &state,
                            NumericFieldNames);
     }
 
-    size_t extensible_count = 0;
     auto const legacy_idd_extensibles_iter = legacy_idd.find("extensibles");
     if (legacy_idd_extensibles_iter != legacy_idd.end()) {
+        size_t extensible_count = 0;
         auto const epJSON_extensions_array_itr = obj_val.find(extension_key);
         if (epJSON_extensions_array_itr != obj_val.end()) {
             auto const &legacy_idd_extensibles = legacy_idd_extensibles_iter.value();
@@ -1738,21 +1738,18 @@ void InputProcessor::preProcessorCheck(EnergyPlusData &state, bool &PreP_Fatal)
     //    A11,       \field message line 9
     //    A12;       \field message line 10
 
-    int NumAlphas;  // Used to retrieve names from IDF
-    int NumNumbers; // Used to retrieve rNumericArgs from IDF
-    int IOStat;     // Could be used in the Get Routines, not currently checked
-    int NumParams;  // Total Number of Parameters in 'Output:PreprocessorMessage' Object
-    int NumPrePM;   // Number of Preprocessor Message objects in IDF
-    int CountP;
-    int CountM;
-    std::string Multiples;
-
     state.dataIPShortCut->cCurrentModuleObject = "Output:PreprocessorMessage";
-    NumPrePM = getNumObjectsFound(state, state.dataIPShortCut->cCurrentModuleObject);
+    int NumPrePM = getNumObjectsFound(state, state.dataIPShortCut->cCurrentModuleObject);
     if (NumPrePM > 0) {
+        int NumAlphas;  // Used to retrieve names from IDF
+        int NumNumbers; // Used to retrieve rNumericArgs from IDF
+        int IOStat;     // Could be used in the Get Routines, not currently checked
+        int NumParams;  // Total Number of Parameters in 'Output:PreprocessorMessage' Object
+        std::string Multiples;
+
         getObjectDefMaxArgs(state, state.dataIPShortCut->cCurrentModuleObject, NumParams, NumAlphas, NumNumbers);
         state.dataIPShortCut->cAlphaArgs({1, NumAlphas}) = BlankString;
-        for (CountP = 1; CountP <= NumPrePM; ++CountP) {
+        for (int CountP = 1; CountP <= NumPrePM; ++CountP) {
             getObjectItem(state,
                           state.dataIPShortCut->cCurrentModuleObject,
                           CountP,
@@ -1797,7 +1794,7 @@ void InputProcessor::preProcessorCheck(EnergyPlusData &state, bool &PreP_Fatal)
                                         "\" has the following " + state.dataIPShortCut->cAlphaArgs(2) + " condition" + Multiples + ':');
                 }
             }
-            CountM = 3;
+            int CountM = 3;
             if (CountM > NumAlphas) {
                 ShowContinueError(state,
                                   state.dataIPShortCut->cCurrentModuleObject + " was blank.  Check " + state.dataIPShortCut->cAlphaArgs(1) +