From 807906e011791c2ad879279e284a5dac7d78d747 Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Fri, 12 Sep 2025 12:46:27 +0200 Subject: [PATCH] Add argument types to function prototypes This enables the use of C23 standard compilers (like gcc-15). --- natgrid/Include/nnchead.h | 50 +++++++++++++++++------------------ natgrid/Include/nncheadd.h | 2 +- natgrid/Include/nncheads.h | 2 +- natgrid/Include/nnghead.h | 6 ++--- natgrid/Include/nngheadd.h | 4 +-- natgrid/Include/nngheads.h | 4 +-- natgrid/Include/nnmhead.h | 54 +++++++++++++++++++------------------- natgrid/Include/nnuheadd.h | 4 +-- natgrid/Include/nnuheads.h | 4 +-- 9 files changed, 65 insertions(+), 65 deletions(-) diff --git a/natgrid/Include/nnchead.h b/natgrid/Include/nnchead.h index 83382115..5a3ee54c 100644 --- a/natgrid/Include/nnchead.h +++ b/natgrid/Include/nnchead.h @@ -37,31 +37,31 @@ extern int datcnt, datcnt3, numtri, imag, numnei, iscale, extern char tri_file[256], error_file[256], emsg[256]; -extern FILE *fopen(), *filee; +extern FILE *filee; -extern void Terminate(); +extern void Terminate(void); extern void ErrorHnd(int, char *, FILE *, char *); -void FindNeigh(); -void TriNeigh(); -void Gradient(); -void FindProp(); -double Surface(); -double Meld(); -void TooSteep(); -void TooShallow(); -void TooNarrow(); -struct datum *IMakeDatum(); -struct simp *IMakeSimp(); -struct temp *IMakeTemp(); -struct neig *IMakeNeig(); -int *IntVect(); -void FreeVecti(); -double *DoubleVect(); -void FreeVectd(); -int **IntMatrix(); -void FreeMatrixi(); -float **FloatMatrix(); -void FreeMatrixf(); -double **DoubleMatrix(); -void FreeMatrixd(); +void FindNeigh(int); +void TriNeigh(void); +void Gradient(void); +void FindProp(double, double); +double Surface(void); +double Meld(double, double, double); +void TooSteep(void); +void TooShallow(void); +void TooNarrow(void); +struct datum *IMakeDatum(void); +struct simp *IMakeSimp(void); +struct temp *IMakeTemp(void); +struct neig *IMakeNeig(void); +int *IntVect(int ncols); +void FreeVecti(int *vectptr); +double *DoubleVect(int ncols); +void FreeVectd(double *vectptr); +int **IntMatrix(int nrows, int ncols); +void FreeMatrixi(int **matptr); +float **FloatMatrix(int nrows, int ncols); +void FreeMatrixf(float **matptr); +double **DoubleMatrix(int nrows, int ncols); +void FreeMatrixd(double **matptr); diff --git a/natgrid/Include/nncheadd.h b/natgrid/Include/nncheadd.h index 694e39d0..525bfb28 100644 --- a/natgrid/Include/nncheadd.h +++ b/natgrid/Include/nncheadd.h @@ -19,4 +19,4 @@ void c_nngetsloped(int, int, double *, int *); void c_nngetaspectd(int, int, double *, int *); void c_nnpntinitd(int, double [], double [], double []); extern void c_nnpntd(double, double, double *); -void c_nnpntendd(); +void c_nnpntendd(void); diff --git a/natgrid/Include/nncheads.h b/natgrid/Include/nncheads.h index f67bed94..db8fc63a 100644 --- a/natgrid/Include/nncheads.h +++ b/natgrid/Include/nncheads.h @@ -10,4 +10,4 @@ void c_nngetslopes(int, int, float *, int *); void c_nngetaspects(int, int, float *, int *); void c_nnpntinits(int, float [], float [], float []); extern void c_nnpnts(float, float, float *); -void c_nnpntend(); +void c_nnpntend(void); diff --git a/natgrid/Include/nnghead.h b/natgrid/Include/nnghead.h index a5221904..c5bfd6ed 100644 --- a/natgrid/Include/nnghead.h +++ b/natgrid/Include/nnghead.h @@ -37,11 +37,11 @@ extern int datcnt, datcnt3, numtri, imag, numnei, iscale, extern char tri_file[256], error_file[256], emsg[256]; -extern FILE *fopen(), *filee; +extern FILE *filee; -extern void Gradient(); +extern void Gradient(void); extern void ErrorHnd(int, char *, FILE *, char *); -extern void CircOut(); +extern void CircOut(void); extern void c_nnsetc(char *, char *); extern void c_nngetc(char *, char *); diff --git a/natgrid/Include/nngheadd.h b/natgrid/Include/nngheadd.h index 59b189b3..da90b0a3 100644 --- a/natgrid/Include/nngheadd.h +++ b/natgrid/Include/nngheadd.h @@ -4,10 +4,10 @@ void Initialized(int, double [], double [], int, int, double armind(int, double *); double armaxd(int, double *); -extern int ReadDatad(); +extern int ReadDatad(int, double *, double *, double *); extern double **MakeGridd(int, int, double *, double *); extern void c_nnsetrd(char *, double); extern void c_nngetrd(char *, double *); -extern void Terminate(); +extern void Terminate(void); diff --git a/natgrid/Include/nngheads.h b/natgrid/Include/nngheads.h index 3549d954..0c071933 100644 --- a/natgrid/Include/nngheads.h +++ b/natgrid/Include/nngheads.h @@ -4,10 +4,10 @@ void Initialize(int, float [], float [], int, int, double armin(int, float *); double armax(int, float *); -extern int ReadData(); +extern int ReadData(int, float *, float *, float *); extern float **MakeGrid(int, int, float *, float *); extern void c_nnsetr(char *, float); extern void c_nngetr(char *, float *); -extern void Terminate(); +extern void Terminate(void); diff --git a/natgrid/Include/nnmhead.h b/natgrid/Include/nnmhead.h index 4610df12..baebe152 100644 --- a/natgrid/Include/nnmhead.h +++ b/natgrid/Include/nnmhead.h @@ -39,40 +39,40 @@ int datcnt, datcnt3, numtri, imag, numnei, iscale, char tri_file[256] = {"nnalg.dat"}, error_file[256] = {"stderr"}, emsg[256]; -FILE *fopen(), *filee = NULL; +FILE *filee = NULL; -extern void Gradient(); +extern void Gradient(void); extern void ErrorHnd(int, char *, FILE *, char *); -extern void CircOut(); +extern void CircOut(void); extern void c_nnsetc(char *, char *); extern void c_nngetc(char *, char *); extern void c_nnseti(char *, int); extern void c_nngeti(char *, int *); -extern void Terminate(); +extern void Terminate(void); extern void ErrorHnd(int, char *, FILE *, char *); -void FindNeigh(); -void TriNeigh(); -void Gradient(); -void FindProp(); -double Surface(); -double Meld(); -void TooSteep(); -void TooShallow(); -void TooNarrow(); -struct datum *IMakeDatum(); -struct simp *IMakeSimp(); -struct temp *IMakeTemp(); -struct neig *IMakeNeig(); -int *IntVect(); -void FreeVecti(); -double *DoubleVect(); -void FreeVectd(); -int **IntMatrix(); -void FreeMatrixi(); -float **FloatMatrix(); -void FreeMatrixf(); -double **DoubleMatrix(); -void FreeMatrixd(); +void FindNeigh(void); +void TriNeigh(void); +void Gradient(void); +void FindProp(void); +double Surface(void); +double Meld(void); +void TooSteep(void); +void TooShallow(void); +void TooNarrow(void); +struct datum *IMakeDatum(void); +struct simp *IMakeSimp(void); +struct temp *IMakeTemp(void); +struct neig *IMakeNeig(void); +int *IntVect(int ncols); +void FreeVecti(int *vectptr); +double *DoubleVect(int ncols); +void FreeVectd(double *vectptr); +int **IntMatrix(int nrows, int ncols); +void FreeMatrixi(int **matptr); +float **FloatMatrix(int nrows, int ncols); +void FreeMatrixf(float **matptr); +double **DoubleMatrix(int nrows, int ncols); +void FreeMatrixd(double **matptr); diff --git a/natgrid/Include/nnuheadd.h b/natgrid/Include/nnuheadd.h index bf756220..ac408681 100644 --- a/natgrid/Include/nnuheadd.h +++ b/natgrid/Include/nnuheadd.h @@ -5,7 +5,7 @@ extern void c_nngetsloped(int, int, double *, int *); extern void c_nngetaspectd(int, int, double *, int *); extern void c_nnpntinitd(int, double *, double *, double *); extern void c_nnpntd(double, double, double *); -extern void c_nnpntendd(); +extern void c_nnpntendd(void); /* * Fortran function macro. This macro is used to provide the appropriate @@ -40,7 +40,7 @@ void NGCALLF(nngetsloped,NNGETSLOPED) (int *, int *, double *, int *); void NGCALLF(nngetaspectd,NNGETASPECTD) (int *, int *, double *, int *); void NGCALLF(nnpntinitd,NNPNTINITD) (int *, double *, double *, double *); void NGCALLF(nnpntd,NNPNTD) (double *, double *, double *); -void NGCALLF(nnpntend,NNPNTEND) (); +void NGCALLF(nnpntend,NNPNTEND) (void); double *c_natgridd(int, double [], double [], double [], int, int, double [], double [], int *); diff --git a/natgrid/Include/nnuheads.h b/natgrid/Include/nnuheads.h index bb56e2f8..e1e8baac 100644 --- a/natgrid/Include/nnuheads.h +++ b/natgrid/Include/nnuheads.h @@ -5,7 +5,7 @@ extern void c_nngetslopes(int, int, float *, int *); extern void c_nngetaspects(int, int, float *, int *); extern void c_nnpntinits(int, float *, float *, float *); extern void c_nnpnts(float, float, float *); -extern void c_nnpntend(); +extern void c_nnpntend(void); /* * Fortran function macro. This macro is used to provide the appropriate @@ -40,7 +40,7 @@ void NGCALLF(nngetslopes,NNGETSLOPES) (int *, int *, float *, int *); void NGCALLF(nngetaspects,NNGETASPECTS) (int *, int *, float *, int *); void NGCALLF(nnpntinits,NNPNTINITS) (int *, float *, float *, float *); void NGCALLF(nnpnts,NNPNTS) (float *, float *, float *); -void NGCALLF(nnpntend,NNPNTEND) (); +void NGCALLF(nnpntend,NNPNTEND) (void); float *c_natgrids(int, float [], float [], float [], int, int, float [], float [], int *);