Skip to content

Commit 5819fc6

Browse files
committed
fixed clang static analyzer warning
1 parent b91af46 commit 5819fc6

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

core/base/separatrixStability/SeparatrixStability.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,12 @@ int ttk::SeparatrixStability::buildOccurenceArrays(
390390
&matchingArraySeparatrixForEachBlock) {
391391

392392
int n_blocks = adjacencyMatrices.size();
393-
int status;
393+
if(n_blocks < 2) {
394+
this->printErr(
395+
"At least two datasets are required to perform calculations.");
396+
return 0;
397+
}
398+
int status{};
394399
for(int i = 0; i < n_blocks; i++) {
395400
matchingArraySeparatrixForEachBlock[i].resize(n_blocks);
396401
for(int j = 0; j < n_blocks; j++) {

core/vtk/ttkSeparatrixStability/ttkSeparatrixStability.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ int ttkSeparatrixStability::execute(
237237
vtkMultiBlockDataSet *&multiBlock1_Separatrices,
238238
vtkMultiBlockDataSet *&output1_Separatrices) {
239239

240-
int status;
240+
int status{};
241241
int n_blocks = multiBlock1_Separatrices->GetNumberOfBlocks();
242242
std::vector<std::vector<int>> LocalToGlobal(n_blocks);
243243
std::vector<GraphMatrixFull> adjacencyMatricesFull(n_blocks);
@@ -320,15 +320,6 @@ int ttkSeparatrixStability::execute(
320320
idCount++;
321321
}
322322

323-
for(int i = 0; i < n_blocks; i++) {
324-
for(int j = 0; j < n_blocks; j++) {
325-
assert(globalDestinationPointIdForEachBlock[i].size()
326-
== matchingArrayForEachBlockDestination[j][i].size());
327-
assert(globalSourcePointIdForEachBlock[i].size()
328-
== matchingArrayForEachBlockSource[j][i].size());
329-
}
330-
}
331-
332323
#ifdef TTK_ENABLE_OPENMP
333324
#pragma omp parallel for num_threads(threadNumber_)
334325
#endif // TTK_ENABLE_OPENMP

0 commit comments

Comments
 (0)