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
|
From: Ole Streicher <olebole@debian.org>
Date: Fri, 9 Aug 2024 08:47:15 +0200
Subject: Fix gcc-14 errors
Closes: #1074941
---
contrib/wavelet/libsrc/io_wave.c | 2 +-
contrib/wavelet/libsrc/pave_cf.c | 1 +
gui/XAlice/src/GaussShell.c | 1 +
gui/XIrspec/src/callback.c | 1 +
gui/XLong/src/ExtractShell.c | 1 +
libsrc/plot/pta-2.fc | 2 +-
prim/edit/libsrc/edtcommand.c | 2 +-
prim/general/libsrc/f2cgen-2.fc | 1 +
stdred/long/src/lnedflux.c | 1 +
system/machine/computer.c | 5 ++++-
10 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/contrib/wavelet/libsrc/io_wave.c b/contrib/wavelet/libsrc/io_wave.c
index e309091..4c93eb0 100644
--- a/contrib/wavelet/libsrc/io_wave.c
+++ b/contrib/wavelet/libsrc/io_wave.c
@@ -207,7 +207,7 @@ Pos2 = Nc2 = Nl2 = 0;
/****************************************************************************/
int wave_io_size_data (Nl, Nc, Nbr_Plan, Type_Wave_Transform)
-int Nl, Nc, Type_Wave_Transform;
+int Nl, Nc, Nbr_Plan, Type_Wave_Transform;
{
int Size;
diff --git a/contrib/wavelet/libsrc/pave_cf.c b/contrib/wavelet/libsrc/pave_cf.c
index 4557485..896b7fa 100644
--- a/contrib/wavelet/libsrc/pave_cf.c
+++ b/contrib/wavelet/libsrc/pave_cf.c
@@ -156,6 +156,7 @@ extern void pyr_2d_cf_create_filter(), prepare_fft_real();
void pave_2d_cf_down (I0, I1, C1, H, G, Etap, Nl, Nc)
complex_float *I0, *I1, *C1;
float *H, *G;
+int Etap;
int Nl,Nc;
{
register int i,j,u,v,Nl_2,Nc_2;
diff --git a/gui/XAlice/src/GaussShell.c b/gui/XAlice/src/GaussShell.c
index 5b1903c..c95de1f 100644
--- a/gui/XAlice/src/GaussShell.c
+++ b/gui/XAlice/src/GaussShell.c
@@ -323,6 +323,7 @@ static void action_HelpGauss( UxWidget, UxEvent, UxParams, p_UxNumParams )
Widget UxWidget;
XEvent *UxEvent;
String *UxParams;
+ int p_UxNumParams;
{
_UxCGaussShell *UxSaveCtx, *UxContext;
swidget UxThisWidget;
diff --git a/gui/XIrspec/src/callback.c b/gui/XIrspec/src/callback.c
index e42f8f6..909aae2 100644
--- a/gui/XIrspec/src/callback.c
+++ b/gui/XIrspec/src/callback.c
@@ -175,6 +175,7 @@ void MainObjectCallback()
}
void BadpixInputCallback( str )
+char *str;
{
/************
char *filename, out[80];
diff --git a/gui/XLong/src/ExtractShell.c b/gui/XLong/src/ExtractShell.c
index 7ee4b6c..a940bc2 100644
--- a/gui/XLong/src/ExtractShell.c
+++ b/gui/XLong/src/ExtractShell.c
@@ -248,6 +248,7 @@ static void action_ClearHelp( UxWidget, UxEvent, UxParams, p_UxNumParams )
Widget UxWidget;
XEvent *UxEvent;
String *UxParams;
+ int p_UxNumParams;
{
_UxCExtractShell *UxSaveCtx, *UxContext;
swidget UxThisWidget;
diff --git a/libsrc/plot/pta-2.fc b/libsrc/plot/pta-2.fc
index c027b60..e270fc5 100644
--- a/libsrc/plot/pta-2.fc
+++ b/libsrc/plot/pta-2.fc
@@ -53,7 +53,7 @@ char *strp_pntr();
*/
-ROUTINE PPP2(xmnmx,ymnmx,labelx,labely,AGLopt)
+ROUTINE PPP2(xmnmx,ymnmx) /* labelx,labely,AGLopt */
float *xmnmx; /* IN : minimum and maximum value along the X-axis */
float *ymnmx; /* IN : minimum and maximum value along the Y-axis */
diff --git a/prim/edit/libsrc/edtcommand.c b/prim/edit/libsrc/edtcommand.c
index 1cb60b3..1d98816 100644
--- a/prim/edit/libsrc/edtcommand.c
+++ b/prim/edit/libsrc/edtcommand.c
@@ -1062,7 +1062,7 @@ int edt_noaction()
return (NULLACTION);
}
-edt_getlabel(label, size)
+int edt_getlabel(label, size)
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
.PURPOSE Get column label interactivelly.
- ------------------------------------------------------------*/
diff --git a/prim/general/libsrc/f2cgen-2.fc b/prim/general/libsrc/f2cgen-2.fc
index cd6451c..cd8627f 100644
--- a/prim/general/libsrc/f2cgen-2.fc
+++ b/prim/general/libsrc/f2cgen-2.fc
@@ -204,6 +204,7 @@ return 0;
ROUTINE YY8(infile,a,b,fmin,fmax)
+char *infile;
float *a;
int *b;
float *fmin;
diff --git a/stdred/long/src/lnedflux.c b/stdred/long/src/lnedflux.c
index f27949c..25b69c6 100644
--- a/stdred/long/src/lnedflux.c
+++ b/stdred/long/src/lnedflux.c
@@ -320,6 +320,7 @@ int n;
}
void free_data( n )
+int n;
{
free_ivector( Row, 0, n-1 );
free_fvector( Wave, 0, n-1 );
diff --git a/system/machine/computer.c b/system/machine/computer.c
index ce8a8c6..a784438 100644
--- a/system/machine/computer.c
+++ b/system/machine/computer.c
@@ -88,6 +88,7 @@
#include <stdint.h>
double ldexp();
+void contin(void);
static char c[80]; /* ... Must be aligned ... */
static int ieee;
@@ -151,6 +152,7 @@ int n, l2e, l2f, nb[3], bitsperbyte;
long int dxb;
+int
main(argc,argv)
int argc;
char **argv;
@@ -467,7 +469,8 @@ int i;
exit(0);
}
-contin()
+void
+contin(void)
{
|