COMP: Declare the exported functions that no header declares - #90
Open
hjmjohnson wants to merge 4 commits into
Open
hjmjohnson wants to merge 4 commits into
hjmjohnson wants to merge 4 commits into
Conversation
FslGetHdrImgNames and FslSetIntensityScaling are defined here but declared nowhere, while FslGetIntensityScaling and FslInit are already published. axml_recur_find_xml sits beside axml_recur in afni_xml.h the same way. The upstream fslio was deleted in 2015 in favour of a C++ replacement, so this copy is the surviving one and its header is ours to correct. Additive; no symbol changes. (cherry picked from commit 4673c40)
Nine functions in fslio.c have external linkage and no declaration in any header. Nothing in the tree calls them across a translation unit, AFNI's vendored copy never calls them, and no public source outside a vendored copy of this file references them, so a caller would have had to declare them itself. Collect their prototypes in one block so the boundary between internal and published is visible in one place. FslSetVoxUnits and FslGetVoxUnits have no caller at all and are left under #if 0 rather than deleted; FslSetTimeUnits and FslGetTimeUnits are published, so the asymmetry is worth keeping visible. Removes nine symbols from libfslio, which the baseline records. (cherry picked from commit 8cdcf1a)
nifti1_io.c and nifti2_io.c each define nifti_fileexists with external linkage, so libniftiio and libnifti2 export the same name and ELF link order decides which one a caller linking both resolves to. Declaring it locally silences the warning without choosing between publishing it and making it static; that choice needs the duplication settled first, and it covers a hundred names, not this one. (cherry picked from commit 54e74e1)
Keeps FslGetAuxFile and FslSetAuxFile deriving the same length so the pair cannot drift if the field width changes. sizeof is 24, so the copy still writes at most 23 bytes. (cherry picked from commit 0c0e66c)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-submission of #37, reverted from
masteron 2026-09-24 so it can bereviewed before merging. Content is unchanged from the original.
Stack position 6 of 10. Base:
ci/widen-coverage(#77), notmaster.Merge the PRs above it in this stack first, or the diff shown here will
include their commits too.
Ordering for this stack
ci/install-linking-srcdirmasterci/test-output-on-failureci/install-linking-srcdirci/guard-cmp0169ci/test-output-on-failureci/build-all-codepathsci/guard-cmp0169ci/widen-coverageci/build-all-codepathspr/fix-missing-prototypesci/widen-coveragefix/buildyml-jobspr/fix-missing-prototypesci/missing-declarationsfix/buildyml-jobsci/windowsci/missing-declarationsci/workflow-trigger-lintci/windowsThe order is the order these changes sat on
masterbefore the revert, soit is known to build and test at every step. Verified again after
rebuilding the stack: the tip configures, compiles with no errors, and
passes 344/344 tests.
Why this one is stacked rather than independent
Each PR in this chain edits the same few files as its predecessors, chiefly
.github/workflows/cmake-multi-platform.yml,cmake/exported_symbols_linux.txtand
cifti/afni_xml.h. Cherry-picked ontomasteralone, the later onesconflict. Two members also carry a build-order dependency rather than a
textual one: without #30 the project does not configure at all on CMake
versions that do not know policy CMP0169, and #29 is needed for
install_linkingto find its source directory.Commits
See #84 for the ordering of all 49 re-submitted pull requests.