Skip to content

Clang-Tidy in CI Fix #1961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremylt merged 2 commits into from
Apr 29, 2026
+11 −11
Merged

Clang-Tidy in CI Fix #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
560918e
tidy - fix fortran string handling bug
jeremylt Apr 28, 2026
79eb6d2
ci - ensure clang-tidy errors
jeremylt Apr 28, 2026
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
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ noether-asan:
- make -k -j$((NPROC_CPU / NPROC_POOL)) BACKENDS="$BACKENDS_CPU" JUNIT_BATCH="memcheck" junit realsearch=%
# Clang-tidy
- echo "-------------- clang-tidy ----------" && clang-tidy --version
- TIDY_OPTS="-fix-errors" make -j$NPROC_CPU tidy && git diff --color=always --exit-code
- TIDY_OPTS="-fix-errors -warnings-as-errors=" make -j$NPROC_CPU tidy
# Report status
- touch .SUCCESS
artifacts:
Expand Down Expand Up @@ -284,7 +284,7 @@ noether-cuda:
- make -k -j$((NPROC_GPU / NPROC_POOL)) BACKENDS="$BACKENDS_GPU" JUNIT_BATCH="cuda" junit search=dealii DEAL_II_DIR=$DEAL_II_DIR
# Clang-tidy
- echo "-------------- clang-tidy ----------" && clang-tidy --version
- TIDY_OPTS="-fix-errors" make -j$NPROC_CPU tidy && git diff --color=always --exit-code
- TIDY_OPTS="-fix-errors -warnings-as-errors=" make -j$NPROC_CPU tidy
# Report status
- touch .SUCCESS
after_script:
Expand Down Expand Up @@ -351,7 +351,7 @@ noether-cuda:
# - make -k -j$((NPROC_GPU / NPROC_POOL)) BACKENDS="$BACKENDS_GPU" JUNIT_BATCH="hip" junit search="petsc fluids solids"
# # Clang-tidy
# - echo "-------------- clang-tidy ----------" && clang-tidy --version
# - TIDY_OPTS="-fix-errors" make -j$NPROC_CPU tidy && git diff --color=always --exit-code
# - TIDY_OPTS="-fix-errors -warnings-as-errors=" make -j$NPROC_CPU tidy
# # Report status
# - touch .SUCCESS
# after_script:
Expand Down Expand Up @@ -402,7 +402,7 @@ noether-rocm:
- make -j$NPROC_CPU
# Clang-tidy
- echo "-------------- clang-tidy ----------" && clang-tidy --version
- TIDY_OPTS="-fix-errors" make -j$NPROC_CPU tidy && git diff --color=always --exit-code
- TIDY_OPTS="-fix-errors -warnings-as-errors=" make -j$NPROC_CPU tidy
# Report status
- touch .SUCCESS

Expand Down
14 changes: 7 additions & 7 deletions interface/ceed-fortran.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ typedef size_t fortran_charlen_t;
typedef int fortran_charlen_t;
#endif

#define Splice(a, b) a##b

// Fortran strings are generally unterminated and the length is passed as an
// extra argument after all the normal arguments. Some compilers (I only know
// of Windows) place the length argument immediately after the string parameter
Expand All @@ -51,11 +49,13 @@ typedef int fortran_charlen_t;
// We can't just NULL-terminate the string in-place because that could overwrite
// other strings or attempt to write to read-only memory. This macro allocates
// a string to hold the null-terminated version of the string that C expects.
#define FIX_STRING(stringname) \
char Splice(stringname, _c)[1024]; \
if (Splice(stringname, _len) > 1023) *err = CeedError(NULL, 1, "Fortran string length too long %zd", (size_t)Splice(stringname, _len)); \
strncpy(Splice(stringname, _c), stringname, Splice(stringname, _len)); \
Splice(stringname, _c)[Splice(stringname, _len)] = 0;
#define CEED_MAX_FORTRAN_STRING_LEN 1024
#define FIX_STRING(stringname) \
char stringname##_c[CEED_MAX_FORTRAN_STRING_LEN] = {'\0'}; \
if (stringname##_len > CEED_MAX_FORTRAN_STRING_LEN - 1) { \
*err = CeedError(NULL, 1, "Fortran string too long: %zd", (size_t)(stringname##_len)); \
} \
strncpy(stringname##_c, stringname, CeedIntMin(stringname##_len, CEED_MAX_FORTRAN_STRING_LEN - 1));

// -----------------------------------------------------------------------------
// Ceed
Expand Down
Loading