Skip to content

COMP: Declare the exported functions that no header declares #90

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

Open
hjmjohnson wants to merge 4 commits into
base: ci/widen-coverage
Choose a base branch
from
Open

COMP: Declare the exported functions that no header declares #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fde6369
ENH: Declare the three functions that have a published counterpart
hjmjohnson Sep 21, 2026
5bfc190
COMP: Give the fsliolib internal functions static linkage
hjmjohnson Sep 21, 2026
091233c
COMP: Declare nifti_fileexists where it is defined
hjmjohnson Sep 21, 2026
9fc0c69
STYLE: Derive the aux_file bound from sizeof
hjmjohnson Sep 21, 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
2 changes: 2 additions & 0 deletions cifti/afni_xml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ int axml_free_xlist(afni_xml_list * axlist);

char * axml_attr_value(afni_xml_t * ax, const char * name);
int axml_recur(int(*func)(FILE*,afni_xml_t*,int), afni_xml_t * ax);
afni_xml_t * axml_recur_find_xml(int (*func)(afni_xml_t *, int), afni_xml_t * ax,
int depth, int max_depth);


/* control API */
Expand Down
9 changes: 0 additions & 9 deletions cmake/exported_symbols_linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ libfslio.so FslCheckForMultipleFileNames
libfslio.so FslCloneHeader
libfslio.so FslClose
libfslio.so FslFileExists
libfslio.so FslFileType
libfslio.so FslFileTypeString
libfslio.so FslGetAnalyzeOrigin
libfslio.so FslGetAuxFile
Expand All @@ -46,30 +45,25 @@ libfslio.so FslGetDim
libfslio.so FslGetDimensionality
libfslio.so FslGetEnvOutputType
libfslio.so FslGetFileType
libfslio.so FslGetFileType2
libfslio.so FslGetHdrImgNames
libfslio.so FslGetIgnoreMFQ
libfslio.so FslGetIntensityScaling
libfslio.so FslGetIntent
libfslio.so FslGetLeftRightOrder
libfslio.so FslGetMMCoord
libfslio.so FslGetOverrideOutputType
libfslio.so FslGetReadFileType
libfslio.so FslGetRigidXform
libfslio.so FslGetStdXform
libfslio.so FslGetTimeUnits
libfslio.so FslGetVolSize
libfslio.so FslGetVolumeAsScaledDouble
libfslio.so FslGetVoxCoord
libfslio.so FslGetVoxDim
libfslio.so FslGetVoxUnits
libfslio.so FslGetWriteMode
libfslio.so FslInit
libfslio.so FslInit4Write
libfslio.so FslInitHeader
libfslio.so FslIsCompressedFileType
libfslio.so FslIsSingleFileType
libfslio.so FslIsValidFileType
libfslio.so FslMakeBaseName
libfslio.so FslOpen
libfslio.so FslReadAllVolumes
Expand All @@ -96,17 +90,14 @@ libfslio.so FslSetRigidXform
libfslio.so FslSetStdXform
libfslio.so FslSetTimeUnits
libfslio.so FslSetVoxDim
libfslio.so FslSetVoxUnits
libfslio.so FslSetWriteMode
libfslio.so FslWriteAllVolumes
libfslio.so FslWriteHeader
libfslio.so FslWriteVolumes
libfslio.so FslXOpen
libfslio.so check_for_multiple_filenames
libfslio.so convertBufferToScaledDouble
libfslio.so d3matrix
libfslio.so d4matrix
libfslio.so fsl_fileexists
libfslio.so mat44_to_mat33
libnifti2.so disp_nifti_1_header
libnifti2.so disp_nifti_2_header
Expand Down
38 changes: 27 additions & 11 deletions fsliolib/fslio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
#include "fslio.h"
#include "assert.h"

/* Internal to this file. Nothing in the tree calls them across a
translation unit, no header declares them, and no public source
outside a vendored copy of this file references them. A downstream
project that needs one declares it in fslio.h with FSL_API. */
static int FslIsValidFileType(int filetype);
static int FslGetFileType2(const FSLIO *fslio, int quiet);
static int FslFileType(const char *fname);
static int FslGetReadFileType(const FSLIO *fslio);
static void FslInit4Write(FSLIO* fslio, const char* filename, int ft);
static int fsl_fileexists(const char* fname);
static int check_for_multiple_filenames(const char* filename);

static int FslIgnoreMFQ=0;
static int FslOverrideOutputType=-1;

Expand Down Expand Up @@ -56,7 +68,7 @@ const char* FslFileTypeString(int filetype)
}


int FslIsValidFileType(int filetype)
static int FslIsValidFileType(int filetype)
{
if ( (filetype!=FSL_TYPE_ANALYZE) && (filetype!=FSL_TYPE_ANALYZE_GZ) &&
(filetype!=FSL_TYPE_NIFTI) && (filetype!=FSL_TYPE_NIFTI_GZ) &&
Expand Down Expand Up @@ -85,7 +97,7 @@ int FslBaseFileType(int filetype)
}


int FslGetFileType2(const FSLIO *fslio, int quiet)
static int FslGetFileType2(const FSLIO *fslio, int quiet)
{
FSLIO *mutablefslio;
if (fslio==NULL) FSLIOERR("FslGetFileType: Null pointer passed for FSLIO");
Expand Down Expand Up @@ -190,7 +202,7 @@ int FslGetEnvOutputType(void)
}


int FslFileType(const char* fname)
static int FslFileType(const char* fname)
{
/* return type is FSL_TYPE_* or -1 to indicate undetermined */
/* use name as first priority but if that is ambiguous then resolve using environment */
Expand Down Expand Up @@ -224,7 +236,7 @@ int FslFileType(const char* fname)
/************************************************************
* FslGetReadFileType
************************************************************/
/*! \fn int FslGetReadFileType(const FSLIO *fslio)
/*! \fn static int FslGetReadFileType(const FSLIO *fslio)
\brief return the best estimate of the true file type

This function is used to return the best estimate of the true file type once
Expand Down Expand Up @@ -389,7 +401,7 @@ void FslSetInit(FSLIO* fslio)



void FslInit4Write(FSLIO* fslio, const char* filename, int ft)
static void FslInit4Write(FSLIO* fslio, const char* filename, int ft)
{
/* ft determines filetype if ft>=0*/
int imgtype;
Expand Down Expand Up @@ -502,7 +514,7 @@ void FslCloneHeader(FSLIO *dest, const FSLIO *src)
}


int fsl_fileexists(const char* fname)
static int fsl_fileexists(const char* fname)
{
znzFile fp;
fp = znzopen( fname , "rb" , 1 ) ;
Expand Down Expand Up @@ -559,7 +571,7 @@ int FslCheckForMultipleFileNames(const char* filename)



int check_for_multiple_filenames(const char* filename)
static int check_for_multiple_filenames(const char* filename)
{
char *basename, *tmpname;
char *otype;
Expand Down Expand Up @@ -1342,8 +1354,9 @@ void FslGetAuxFile(FSLIO *fslio,char *aux_file)
{
if (fslio==NULL) FSLIOERR("FslGetAuxFile: Null pointer passed for FSLIO");
if (fslio->niftiptr!=NULL) {
strncpy(aux_file,fslio->niftiptr->aux_file, 24);
aux_file[24-1] = '\0';
/* aux_file must have room for sizeof(nifti_1_header::aux_file) bytes. */
strncpy(aux_file,fslio->niftiptr->aux_file,sizeof(fslio->niftiptr->aux_file)-1);
aux_file[sizeof(fslio->niftiptr->aux_file)-1] = '\0';
}
if (fslio->mincptr!=NULL) {
fprintf(stderr,"Warning:: Minc is not yet supported\n");
Expand All @@ -1364,7 +1377,9 @@ void FslSetAuxFile(FSLIO *fslio,const char *aux_file)
}


void FslSetVoxUnits(FSLIO *fslio, const char *units)
#if 0
/* No caller in this file, no header declares them, and no public source uses them. */
static void FslSetVoxUnits(FSLIO *fslio, const char *units)
{
int unitcode=0;
if (fslio==NULL) FSLIOERR("FslSetVoxUnits: Null pointer passed for FSLIO");
Expand All @@ -1384,7 +1399,7 @@ void FslSetVoxUnits(FSLIO *fslio, const char *units)
}


void FslGetVoxUnits(FSLIO *fslio, char *units)
static void FslGetVoxUnits(FSLIO *fslio, char *units)
{
if (fslio==NULL) FSLIOERR("FslGetVoxUnits: Null pointer passed for FSLIO");
if (fslio->niftiptr!=NULL) {
Expand All @@ -1394,6 +1409,7 @@ void FslGetVoxUnits(FSLIO *fslio, char *units)
fprintf(stderr,"Warning:: Minc is not yet supported\n");
}
}
#endif

void FslSetTimeUnits(FSLIO *fslio, const char *units)
{
Expand Down
3 changes: 3 additions & 0 deletions fsliolib/fslio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ FSL_API int FslReadRawHeader(void *buffer, const char* filename);
/* simple creation and clone/copy operations */

FSL_API FSLIO *FslInit(void);
FSL_API void FslGetHdrImgNames(const char* filename, const FSLIO* fslio,
char** hdrname, char** imgname);
FSL_API void FslInitHeader(FSLIO *fslio, short t,
size_t x, size_t y, size_t z, size_t v,
float vx, float vy, float vz, float tr,
Expand Down Expand Up @@ -233,6 +235,7 @@ FSL_API void FslGetTimeUnits(FSLIO *fslio, char *units);
FSL_API void FslSetDataType(FSLIO *fslio, short t);
FSL_API size_t FslGetDataType(FSLIO *fslio, short *t);
FSL_API int FslGetIntensityScaling(FSLIO *fslio, float *slope, float *intercept);
FSL_API void FslSetIntensityScaling(FSLIO *fslio, float slope, float intercept);
FSL_API void FslSetIntent(FSLIO *fslio, short intent_code, float p1, float p2, float p3);
FSL_API short FslGetIntent(FSLIO *fslio, short *intent_code, float *p1, float *p2,
float *p3);
Expand Down
3 changes: 3 additions & 0 deletions nifti2/nifti2_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,9 @@ static const nifti_type_ele nifti_type_list[] = {
};

/*---------------------------------------------------------------------------*/
/* Defined in both libniftiio and libnifti2; linkage pending that duplication. */
int nifti_fileexists(const char* fname);

/* prototypes for internal functions - not part of exported library */

/* extension routines */
Expand Down
3 changes: 3 additions & 0 deletions niftilib/nifti1_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,9 @@ static const nifti_type_ele nifti_type_list[] = {
};

/*---------------------------------------------------------------------------*/
/* Defined in both libniftiio and libnifti2; linkage pending that duplication. */
int nifti_fileexists(const char* fname);

/* prototypes for internal functions - not part of exported library */

/* extension routines */
Expand Down