1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
|
From: Ole Streicher <olebole@debian.org>
Date: Fri, 12 Sep 2025 12:46:27 +0200
Subject: Add argument types to function prototypes
Closes: #1114276
---
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 8338211..5a3ee54 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 694e39d..525bfb2 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 f67bed9..db8fc63 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 a522190..c5bfd6e 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 59b189b..da90b0a 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 3549d95..0c07193 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 4610df1..baebe15 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 bf75622..ac40868 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 bb56e2f..e1e8baa 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 *);
|