Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit 8de494b

Browse files
Fixes bandit and klocwork issues (#967)
1 parent f9dd4d7 commit 8de494b

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

.bandit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[bandit]
2+
exclude: ./buildscripts/*

sdc/native/sort.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,11 @@ void parallel_sort(void* begin, uint64_t len, uint64_t size, void* compare)
147147
static const std::array<parallel_sort_call, MaxFixSize> fixed_size_sort = fill_parallel_sort_array<MaxFixSize, parallel_sort_fixed_size>();
148148

149149
auto cmp = reinterpret_cast<compare_func>(compare);
150-
if (size <= MaxFixSize)
151-
return fixed_size_sort[size - 1](begin, len, cmp);
152-
153-
return sort_by_argsort<uint64_t>(begin, len, size, cmp, parallel_argsort_<uint64_t>);
150+
if (size <= MaxFixSize) {
151+
fixed_size_sort[size - 1](begin, len, cmp);
152+
} else {
153+
sort_by_argsort<uint64_t>(begin, len, size, cmp, parallel_argsort_<uint64_t>);
154+
}
154155
}
155156

156157
}

sdc/native/stable_sort.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,11 @@ void parallel_stable_sort(void* begin, uint64_t len, uint64_t size, void* compar
336336
static const std::array<parallel_sort_call, MaxFixSize> fixed_size_sort = fill_parallel_sort_array<MaxFixSize, parallel_sort_fixed_size>();
337337

338338
auto cmp = reinterpret_cast<compare_func>(compare);
339-
if (size <= MaxFixSize)
340-
return fixed_size_sort[size - 1](begin, len, cmp);
341-
342-
return sort_by_argsort<uint64_t>(begin, len, size, cmp, parallel_stable_argsort_<uint64_t>);
339+
if (size <= MaxFixSize) {
340+
fixed_size_sort[size - 1](begin, len, cmp);
341+
} else {
342+
sort_by_argsort<uint64_t>(begin, len, size, cmp, parallel_stable_argsort_<uint64_t>);
343+
}
343344
}
344345

345346
}

sdc/native/utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct tbb_context
8383

8484
void finalize()
8585
{
86-
if (arena)
86+
if (!arena)
8787
return;
8888

8989
arena->terminate();

0 commit comments

Comments
 (0)