Preclude C-style arrays by Lestropie · Pull Request #3251 · MRtrix3/mrtrix3

Lestropie · 2026-01-05T01:06:39Z

Further extension of #3212.

Closes #3240.

There was a comment in #2665 that it would be preferable to avoid the use of C-style arrays, and it immediately occurred to me that we should be able to enforce this; as noted in #3243 this may not be an optimal solution, but it's possible, and I was having fun with regexes.

Note that there's a somewhat unrelated change hidden in here: sh2peaks was using its own direction set, and in trying to refactor for this change it was vastly easier to instead make use of the internally-defined set. But this does mean that there's scope for the outcomes of that command to change; and also it may not be terribly discoverable being part of this PR. So it might be safer for me to create that in a standalone PR.

Conflicts: cpp/core/dwi/tractography/GT/particlegrid.cpp cpp/core/dwi/tractography/GT/particlegrid.h

Conflicts: cpp/cmd/sh2peaks.cpp

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 28. Check the log or trigger a new build to see more.

github-actions · 2026-01-13T03:18:52Z

        points.resize(3 * number_of_points);
-        input.read((char *)points.data(), 3 * number_of_points * sizeof(float));
+        input.read(reinterpret_cast<char *>(points.data()),
+                   3UL * static_cast<unsigned long>(number_of_points) * sizeof(float));


warning: narrowing conversion from 'unsigned long' to signed type 'streamsize' (aka 'long') is implementation-defined [bugprone-narrowing-conversions]

3UL * static_cast<unsigned long>(number_of_points) * sizeof(float)); ^

github-actions · 2026-01-13T03:18:52Z

        for (size_t neighbour_index = 0; neighbour_index != 8; ++neighbour_index) {
          assign_pos_of(lower_corner + neighbour_offsets[neighbour_index]).to(voxel);
-          in_vertex_values[neighbour_index] = 0.0f;
+          in_vertex_values[neighbour_index] = 0.0F;


warning: do not use array subscript when the index is not an integer constant expression [cppcoreguidelines-pro-bounds-constant-array-index]

in_vertex_values[neighbour_index] = 0.0F; ^

github-actions · 2026-01-13T03:18:52Z

-          const uint32_t indices[3]{edge_to_output_vertex[*first_edge],
-                                    edge_to_output_vertex[*(first_edge + 2)],
-                                    edge_to_output_vertex[*(first_edge + 1)]};
+        const auto &row = cube_triangle_table[code];


warning: do not use array subscript when the index is not an integer constant expression [cppcoreguidelines-pro-bounds-constant-array-index]

const auto &row = cube_triangle_table[code]; ^

github-actions · 2026-01-13T03:18:52Z

-                                    edge_to_output_vertex[*(first_edge + 1)]};
+        const auto &row = cube_triangle_table[code];
+        for (ssize_t first_edge_index = 0; row[first_edge_index] >= 0; first_edge_index += 3) {
+          const std::array<uint32_t, 3> indices{edge_to_output_vertex[row[first_edge_index]],


warning: do not use array subscript when the index is not an integer constant expression [cppcoreguidelines-pro-bounds-constant-array-index]

const std::array<uint32_t, 3> indices{edge_to_output_vertex[row[first_edge_index]], ^

github-actions · 2026-01-13T03:18:52Z

+        const auto &row = cube_triangle_table[code];
+        for (ssize_t first_edge_index = 0; row[first_edge_index] >= 0; first_edge_index += 3) {
+          const std::array<uint32_t, 3> indices{edge_to_output_vertex[row[first_edge_index]],
+                                                edge_to_output_vertex[row[first_edge_index + 2]],


warning: do not use array subscript when the index is not an integer constant expression [cppcoreguidelines-pro-bounds-constant-array-index]

edge_to_output_vertex[row[first_edge_index + 2]], ^

github-actions · 2026-01-13T03:18:53Z

-  int font_width[256], font_height;
-  float font_tex_pos[256], font_tex_width[256];
+  std::array<int, 256> font_width;
+  int font_height;


warning: member variable 'font_height' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

int font_height; ^

github-actions · 2026-01-13T03:18:53Z

-  float font_tex_pos[256], font_tex_width[256];
+  std::array<int, 256> font_width;
+  int font_height;
+  std::array<float, 256> font_tex_pos;


warning: member variable 'font_tex_pos' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<float, 256> font_tex_pos; ^

github-actions · 2026-01-13T03:18:53Z

+  std::array<int, 256> font_width;
+  int font_height;
+  std::array<float, 256> font_tex_pos;
+  std::array<float, 256> font_tex_width;


warning: member variable 'font_tex_width' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<float, 256> font_tex_width; ^

github-actions · 2026-01-13T03:18:53Z


 protected:
-  GLfloat v[4];
+  std::array<GLfloat, 4> v;


warning: member variable 'v' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<GLfloat, 4> v; ^

github-actions · 2026-01-13T03:18:53Z


 protected:
-  GLfloat m[16];
+  std::array<GLfloat, 16> m;


warning: member variable 'm' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<GLfloat, 16> m; ^

github-actions

clang-tidy made some suggestions

github-actions · 2026-01-13T03:37:21Z

 protected:
  GL::mat4 MV, iMV, P, iP, MVP, iMVP;
-  GLint viewport[4];
+  std::array<GLint, 4> viewport;


warning: member variable 'viewport' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<GLint, 4> viewport; ^

github-actions · 2026-01-13T03:37:22Z


 protected:
-  GLuint index[3];
+  std::array<GLuint, 3> index;


warning: member variable 'index' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<GLuint, 3> index; ^

github-actions · 2026-01-13T03:37:22Z


 protected:
-  GLuint index[3];
+  std::array<GLuint, 3> index;


warning: member variable 'index' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

std::array<GLuint, 3> index; ^

MRtrixBot and others added 2 commits December 2, 2025 10:29

Refactor Marching Cubes data

c895625

check_syntax: Preclude C-style arrays

ce7ab35

Lestropie self-assigned this Jan 5, 2026

Lestropie added CI/tests code quality labels Jan 5, 2026

Lestropie mentioned this pull request Jan 5, 2026

check_syntax: Fix ignoring commented content #3240

Closed

This comment was marked as outdated.

Sign in to view

Lestropie added 2 commits January 13, 2026 13:06

clang-tidy suggestions #3251

67cd9ed

Merge remote-tracking branch 'origin/dev' into check_syntax_no_c_arrays

54cd809

Conflicts: cpp/core/dwi/tractography/GT/particlegrid.cpp cpp/core/dwi/tractography/GT/particlegrid.h

Lestropie mentioned this pull request Jan 13, 2026

sh2peaks: Change default internal direction set to standardised #3256

Merged

This comment was marked as outdated.

Sign in to view

MRtrixBot and others added 2 commits January 13, 2026 13:57

Update documentation #2938

498495d

Merge remote-tracking branch 'origin/dev' into check_syntax_no_c_arrays

fe72af4

Conflicts: cpp/cmd/sh2peaks.cpp

github-actions Bot reviewed Jan 13, 2026

View reviewed changes

Lestropie merged commit 9ee573d into dev Jan 13, 2026
6 checks passed

Lestropie deleted the check_syntax_no_c_arrays branch January 13, 2026 03:52

Conversation

Lestropie commented Jan 5, 2026

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants