Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/dev/clang-tidy-fixes-2026-04.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@
- [ ] [readability-identifier-naming](https://clang.llvm.org/extra/clang-tidy/checks/readability/identifier-naming.html) (279)
- [ ] [readability-inconsistent-declaration-parameter-name](https://clang.llvm.org/extra/clang-tidy/checks/readability/inconsistent-declaration-parameter-name.html) (7)
- [ ] [readability-inconsistent-ifelse-braces](https://clang.llvm.org/extra/clang-tidy/checks/readability/inconsistent-ifelse-braces.html) (16)
- [ ] [readability-isolate-declaration](https://clang.llvm.org/extra/clang-tidy/checks/readability/isolate-declaration.html) (7)
- [x] [readability-isolate-declaration](https://clang.llvm.org/extra/clang-tidy/checks/readability/isolate-declaration.html) (7)
- [PR #756](https://github.com/Framework-R-D/phlex/pull/756)
- [ ] [readability-math-missing-parentheses](https://clang.llvm.org/extra/clang-tidy/checks/readability/math-missing-parentheses.html) (6)
- [ ] [readability-qualified-auto](https://clang.llvm.org/extra/clang-tidy/checks/readability/qualified-auto.html) (20)
- [ ] [readability-redundant-access-specifiers](https://clang.llvm.org/extra/clang-tidy/checks/readability/redundant-access-specifiers.html) (3)
Expand Down
4 changes: 3 additions & 1 deletion plugins/python/src/errorwrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ bool phlex::experimental::msg_from_py_error(std::string& msg, bool check_error)
}

#if PY_VERSION_HEX < 0x30c000000
PyObject *type = nullptr, *value = nullptr, *traceback = nullptr;
PyObject* type = nullptr;
PyObject* value = nullptr;
PyObject* traceback = nullptr;
PyErr_Fetch(&type, &value, &traceback);
if (value) {
bool tb_ok = format_traceback(msg, type, value, traceback);
Expand Down
17 changes: 13 additions & 4 deletions plugins/python/src/modulewrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,10 @@ static PyObject* parse_args(PyObject* args,
static std::array<char const*, 6> const kwnames{
"callable", "input_family", "output_product_suffixes", "concurrency", "name", nullptr};
#endif
PyObject *callable = nullptr, *input = nullptr, *output = nullptr, *pyname = nullptr;
PyObject* callable = nullptr;
PyObject* input = nullptr;
PyObject* output = nullptr;
PyObject* pyname = nullptr;
int nconcur_ = -1;
if (!PyArg_ParseTupleAndKeywords(
args, kwds, "OO|OiO", std::data(kwnames), &callable, &input, &output, &nconcur_, &pyname)) {
Expand Down Expand Up @@ -1020,7 +1023,9 @@ static PyObject* md_transform(py_phlex_module* mod, PyObject* args, PyObject* kw

std::string cname;
std::vector<product_selector> input_selectors;
std::vector<std::string> input_types, output_suffixes, output_types;
std::vector<std::string> input_types;
std::vector<std::string> output_suffixes;
std::vector<std::string> output_types;
auto nconcur = (concurrency)-1;
PyObject* callable = parse_args(
args, kwds, cname, input_selectors, input_types, output_suffixes, output_types, nconcur);
Expand Down Expand Up @@ -1164,7 +1169,9 @@ static PyObject* md_observe(py_phlex_module* mod, PyObject* args, PyObject* kwds

std::string cname;
std::vector<product_selector> input_selectors;
std::vector<std::string> input_types, output_suffixes, output_types;
std::vector<std::string> input_types;
std::vector<std::string> output_suffixes;
std::vector<std::string> output_types;
auto nconcur = (concurrency)-1;
PyObject* callable = parse_args(
args, kwds, cname, input_selectors, input_types, output_suffixes, output_types, nconcur);
Expand Down Expand Up @@ -1337,7 +1344,9 @@ static PyObject* sc_provide(py_phlex_source* src, PyObject* args, PyObject* kwds
#else
static std::array<char const*, 4> const kwnames{"callable", "output_product", "name", nullptr};
#endif
PyObject *callable = nullptr, *output = nullptr, *pyname = nullptr;
PyObject* callable = nullptr;
PyObject* output = nullptr;
PyObject* pyname = nullptr;
if (!PyArg_ParseTupleAndKeywords(
args, kwds, "OO|O", std::data(kwnames), &callable, &output, &pyname)) {
// error already set by argument parser
Expand Down
3 changes: 2 additions & 1 deletion test/form/reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ int main(int argc, char** argv)
iss >> type;
if (type == "SEG") {
SegChecksum cs{};
int nevent{}, nseg{};
int nevent{};
int nseg{};
iss >> nevent >> nseg >> cs.check >> cs.cpx >> cs.cpy >> cs.cpz;
expected_seg[{nevent, nseg}] = cs;
} else if (type == "EVT") {
Expand Down
Loading