107 lines
3.5 KiB
Diff
107 lines
3.5 KiB
Diff
|
diff -Naur src.orig/cleanup.c src/cleanup.c
|
||
|
|
--- src.orig/cleanup.c 2024-11-17 18:24:00.000000000 +0100
|
||
|
|
+++ src/cleanup.c 2024-12-17 22:12:51.805849977 +0100
|
||
|
|
@@ -31,7 +31,7 @@
|
||
|
|
strncpy(line, ut.ut_line, UT_LINESIZE);
|
||
|
|
bzero(ut.ut_name, UT_NAMESIZE);
|
||
|
|
bzero(ut.ut_host, UT_HOSTSIZE);
|
||
|
|
- time(&ut.ut_time);
|
||
|
|
+ time((time_t *) &ut.ut_time);
|
||
|
|
lseek(fd, -(off_t)sizeof(struct utmp), L_INCR);
|
||
|
|
write(fd, &ut, sizeof(struct utmp));
|
||
|
|
close(fd);
|
||
|
|
@@ -56,7 +56,7 @@
|
||
|
|
strncpy(ut.ut_line, line, sizeof(ut.ut_line));
|
||
|
|
strncpy(ut.ut_name, name, sizeof(ut.ut_name));
|
||
|
|
strncpy(ut.ut_host, host, sizeof(ut.ut_host));
|
||
|
|
- time(&ut.ut_time);
|
||
|
|
+ time((time_t *) &ut.ut_time);
|
||
|
|
if (write(fd, &ut, sizeof(struct utmp)) != sizeof(struct utmp))
|
||
|
|
ftruncate(fd, buf.st_size);
|
||
|
|
}
|
||
|
|
diff -Naur src.orig/fftw.c src/fftw.c
|
||
|
|
--- src.orig/fftw.c 2024-11-17 18:24:00.000000000 +0100
|
||
|
|
+++ src/fftw.c 2024-12-17 21:53:32.872758461 +0100
|
||
|
|
@@ -9,14 +9,14 @@
|
||
|
|
#include <sys/types.h>
|
||
|
|
#include <stdlib.h>
|
||
|
|
|
||
|
|
-static fftwf_plan p;
|
||
|
|
+static fftw_plan p;
|
||
|
|
|
||
|
|
fftwf_complex* plan(uint n)
|
||
|
|
{
|
||
|
|
fftwf_complex *io;
|
||
|
|
|
||
|
|
io = (fftwf_complex*) fftw_malloc(sizeof(fftwf_complex) * n);
|
||
|
|
- p = fftw_plan_dft_1d(n, io, io, FFTW_FORWARD, FFTW_ESTIMATE);
|
||
|
|
+ p = fftw_plan_dft_1d(n, (fftw_complex *)io, (fftw_complex *)io, FFTW_FORWARD, FFTW_ESTIMATE);
|
||
|
|
return io;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -Naur src.orig/gpspos.c src/gpspos.c
|
||
|
|
--- src.orig/gpspos.c 2024-11-17 18:24:00.000000000 +0100
|
||
|
|
+++ src/gpspos.c 2024-12-17 20:14:30.995289257 +0100
|
||
|
|
@@ -1306,7 +1306,7 @@
|
||
|
|
sizeof(struct YUMA_structAlmanac [32]));
|
||
|
|
memset((char *)rinexalm,(char)0,
|
||
|
|
sizeof(struct structEphemeris [3072]));
|
||
|
|
- semok = fnsem[0UL] && SEM_ReadAlmanacDataFromFile(fnsem, (char *)alm,
|
||
|
|
+ semok = fnsem[0UL] && SEM_ReadAlmanacDataFromFile(fnsem, (SEM_structAlmanac *)alm,
|
||
|
|
32U, &cnt);
|
||
|
|
if (semok) {
|
||
|
|
for (i = 0UL; i<=31UL; i++) {
|
||
|
|
@@ -1314,9 +1314,9 @@
|
||
|
|
} /* end for */
|
||
|
|
}
|
||
|
|
yumaok = fnyuma[0UL] && YUMA_ReadAlmanacDataFromFile(fnyuma,
|
||
|
|
- (char *)yumaalm, 32U, &cnt);
|
||
|
|
+ (YUMA_structAlmanac *)yumaalm, 32U, &cnt);
|
||
|
|
rinexok = fnrinex[0UL] && RINEX_DecodeGPSNavigationFile(fnrinex,
|
||
|
|
- (char *) &rinexklobuchar, (char *)rinexalm, 3071UL,
|
||
|
|
+ (GNSS_structKlobuchar *) &rinexklobuchar, (GPS_structEphemeris *)rinexalm, 3071UL,
|
||
|
|
&ri);
|
||
|
|
if (rinexok && ri>0UL) {
|
||
|
|
if (verb) {
|
||
|
|
diff -Naur src.orig/l2cat.c src/l2cat.c
|
||
|
|
--- src.orig/l2cat.c 2024-11-17 18:24:00.000000000 +0100
|
||
|
|
+++ src/l2cat.c 2024-12-17 22:31:30.565938321 +0100
|
||
|
|
@@ -1729,7 +1729,7 @@
|
||
|
|
l2_L2Init(1000U, sockset, eventproc);
|
||
|
|
l2_l2verb = verb;
|
||
|
|
l2_dupchk = axudpchk;
|
||
|
|
- signal(SIGCHLD, cleanup); /*CleanWho*/
|
||
|
|
+ signal(SIGCHLD, (void *)cleanup); /*CleanWho*/
|
||
|
|
/*
|
||
|
|
MOVE(ADR(mycall), ADR(hc[0*7]), 7); (* via call *)
|
||
|
|
MOVE(ADR(mycall), ADR(hc[1*7]), 7); (* connect call *)
|
||
|
|
diff -Naur src.orig/radio.c src/radio.c
|
||
|
|
--- src.orig/radio.c 2024-11-17 18:24:00.000000000 +0100
|
||
|
|
+++ src/radio.c 2024-12-17 22:07:56.525826660 +0100
|
||
|
|
@@ -154,20 +154,20 @@
|
||
|
|
char s[1001];
|
||
|
|
float fr;
|
||
|
|
unsigned long n;
|
||
|
|
- unsigned long m;
|
||
|
|
- long ni;
|
||
|
|
+ uint32_t m;
|
||
|
|
+ int32_t ni;
|
||
|
|
char ok0;
|
||
|
|
mono = 0;
|
||
|
|
rds = 0;
|
||
|
|
verb = 0;
|
||
|
|
- afc = 50UL;
|
||
|
|
+ uint32_t afc = 50UL;
|
||
|
|
strncpy(url,"127.0.0.1",1001u);
|
||
|
|
strncpy(port,"1234",1001u);
|
||
|
|
soundfn[0] = 0;
|
||
|
|
tune = 100000000UL;
|
||
|
|
- ifwidth = 0UL;
|
||
|
|
+ uint32_t ifwidth = 0UL;
|
||
|
|
firw = 0.0f;
|
||
|
|
- firl = 16UL;
|
||
|
|
+ uint32_t firl = 16UL;
|
||
|
|
for (;;) {
|
||
|
|
osi_NextArg(s, 1001ul);
|
||
|
|
if (s[0U]==0) break;
|