TimeSeriesPlatformLibrary: Minor code optimizations and cleanup per PVS-Studio analysis.

J. Ritchie Carroll committed 7 years ago

Commit c36ddbf1 parent 4a5df8a14 files · +391 −93Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Data/DataRow.cpp (1 of 14 files). Show all

Unified · Split

 DataRow::~DataRow()
 {
     for (uint32_t i = 0; i < m_values.size(); i++)
-    {
+        free(m_values[i]);
-        if (m_values[i])
-            free(m_values[i]);
-    }
 }
 int32_t DataRow::GetColumnIndex(const string& columnName) const
     const auto expressionTrees = parser->GetExpressionTrees();
     if (expressionTrees.empty())
+    {
+        delete parser;
         throw DataSetException("Expression defined for computed DataColumn \"" + column->Name() + " for table \"" + m_parent->Name() + "\" cannot produce a value");
+    }
     m_values[columnIndex] = parser;
     if (value.HasValue())
     {
         uint8_t* copy = static_cast<uint8_t*>(malloc(sizeof(T)));
-        memcpy(copy, &value.Value, sizeof(T));
+        memcpy(copy, &value.Value, sizeof(T)); //-V575
         m_values[columnIndex] = copy;
     }
     else
     if (value.HasValue())
     {
         uint8_t* copy = static_cast<uint8_t*>(malloc(1));
-        *copy = value.GetValueOrDefault() ? 1 : 0;
+        *copy = value.GetValueOrDefault() ? 1 : 0; //-V522
         m_values[columnIndex] = copy;
     }
     else
     if (value.HasValue())
     {
         int8_t* copy = static_cast<int8_t*>(malloc(16));
-        memcpy(copy, value.GetValueOrDefault().data, 16);
+        memcpy(copy, value.GetValueOrDefault().data, 16); //-V575
         m_values[columnIndex] = copy;
     }
     else

Keyboard shortcuts