On Sat, 20 May 2023 08:44:07 -0400
Josh Rovero via wsjt-devel <wsjt-devel@lists.sourceforge.net> wrote:
> Same errors as with FC37, 64-bit.
> On FC38, gcc version 13.1.1 20230511 (Red Hat 13.1.1-2) (GCC)
>
> /home/josh/Downloads/wsjtx-2.7.0/src/wsjtx-prefix/src/wsjtx/qmap/libqmap/q65c.f90:23:39:
>
> 23 | ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift,
> &
> | 1
> Error: Symbol ‘nfa’ at (1) is USE associated from module ‘q65’ and
> cannot occur in COMMON
> make[5]: *** [qmap/libqmap/CMakeFiles/qmap_impl.dir/build.make:336:
> qmap/libqmap/CMakeFiles/qmap_impl.dir/q65c.f90.o] Error 1
> make[4]: *** [CMakeFiles/Makefile2:2129:
> qmap/libqmap/CMakeFiles/qmap_impl.dir/all] Error 2
> make[3]: *** [Makefile:156: all] Error 2
> make[2]: *** [CMakeFiles/wsjtx-build.dir/build.make:73:
> wsjtx-prefix/src/wsjtx-stamp/wsjtx-build] Error 2
> make[1]: *** [CMakeFiles/Makefile2:279:
> CMakeFiles/wsjtx-build.dir/all] Error 2
> make: *** [Makefile:91: all] Error 2
>
This patch will sort things out for the newer compilers in Fedora,
originally provided by K7FU:
diff -Naur wsjtx.orig/qmap/astro.cpp wsjtx/qmap/astro.cpp
--- wsjtx.orig/qmap/astro.cpp 2023-05-12 13:55:48
+++ wsjtx/qmap/astro.cpp 2023-05-12 13:57:23
@@ -72,7 +72,7 @@
datcom_.ndop00=ndop00; //Send self Doppler to decoder, via
datcom
// qDebug() << "aa" << isec << datcom_.fcenter << nfreq << ndop00;
- sprintf(cc,
+ snprintf(cc, sizeof(cc),
"Az: %6.1f\n"
"El: %6.1f\n"
"MyDop: %6d\n"
@@ -140,7 +140,7 @@
if(f.open(QIODevice::WriteOnly | QIODevice::Append)) {
QTextStream out(&f);
out << t.toString("yyyy-MMM-dd hh:mm:ss");
- sprintf(cc,"%7.1f %7.1f %d %7.1f %7.1f %10.1f %7.2f\n",
+ snprintf(cc,sizeof(cc),"%7.1f %7.1f %d %7.1f %7.1f %10.1f %7.2f\n",
azsun,elsun,iCycle,azOffset,elOffset,xavg,10.0*log10(xavg));
out << cc;
f.close();
@@ -168,7 +168,7 @@
if(ntxFreq != ntxFreq0) ndiff=1;
ntxFreq0=ntxFreq;
QTextStream out(&f);
- sprintf(cc,"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Moon\n"
+ snprintf(cc,sizeof(cc),"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Moon\n"
"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Sun\n"
"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Source\n"
"%4d,%6d,%6d,Doppler\n"
diff -Naur wsjtx.orig/qmap/libqmap/q65c.f90 wsjtx/qmap/libqmap/q65c.f90
--- wsjtx.orig/qmap/libqmap/q65c.f90 2023-05-12 13:55:48
+++ wsjtx/qmap/libqmap/q65c.f90 2023-05-12 13:56:41
@@ -20,9 +20,9 @@
!### REMEMBER that /npar/ is not updated until nparams=nparams0 is executed.
###
common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, &
- ndepth,ndiskdat,neme,newdat,nfa,nfb,nfcal,nfshift, &
+ ndepth,ndiskdat,neme,newdat,nfcal,nfshift, &
mcall3,nkeep,ntol,nxant,nrxlog,nfsample,nxpol,nmode, &
- ndop00,nsave,max_drift,nhsym,mycall,mygrid,hiscall,hisgrid, &
+ ndop00,nsave,nhsym,mycall,mygrid,hiscall,hisgrid, &
datetime,junk1,junk2
equivalence (nparams,fcenter)
data first/.true./
diff -Naur wsjtx.orig/qmap/soundin.cpp wsjtx/qmap/soundin.cpp
--- wsjtx.orig/qmap/soundin.cpp 2023-05-12 13:55:48
+++ wsjtx/qmap/soundin.cpp 2023-05-12 13:57:57
@@ -173,7 +173,7 @@
int ntr;
int nhsym0=0;
int iz=174;
- int nBusy=0;
+// int nBusy=0;
// Main loop for input of UDP packets over the network:
while (!qe) {
@@ -217,7 +217,7 @@
m_hsym=(k-2048)*11025.0/(2048.0*m_rate);
if(m_hsym != nhsym0) {
if(m_dataSinkBusy) {
- nBusy++;
+ // nBusy++;
} else {
m_dataSinkBusy=true;
emit readyForFFT(k); //Signal to compute new FFTs
--
Brian G8SEZ
_______________________________________________
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
