From d4d37c49ab374fa726cfe5e5b25d6336df02c3b3 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 19 Mar 2020 12:04:56 -0400 Subject: [PATCH] Silence compiler warnings. --- lib/hspec.f90 | 6 ++---- lib/mskrtd.f90 | 7 +++---- widgets/mainwindow.cpp | 8 +++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/hspec.f90 b/lib/hspec.f90 index 920b2bfe0..144ddf194 100644 --- a/lib/hspec.f90 +++ b/lib/hspec.f90 @@ -1,6 +1,6 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & btrain,pcoeffs,ingain,mycall,hiscall,bshmsg,bswl,datadir,green,s, & - jh,pxmax,dbNoGain,line1,mygrid) + jh,pxmax,dbNoGain,line1) ! Input: ! k pointer to the most recent new data @@ -22,7 +22,6 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & character*80 line1 character*512 datadir character*12 mycall,hiscall - character*6 mygrid integer*2 id2(0:120*12000-1) logical*1 bmsk144,bshmsg,btrain,bswl real green(0:JZ-1) @@ -97,8 +96,7 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & tt2=sum(float(abs(id2(k0:k0+3583)))) if(tt1.ne.0.0 .and. tt2.ne.0) then call mskrtd(id2(k-7168+1:k),nutc0,tsec,ntol,nrxfreq,ndepth, & - mycall,mygrid,hiscall,bshmsg,btrain,pcoeffs,bswl, & - datadir,line1) + mycall,hiscall,bshmsg,btrain,pcoeffs,bswl,datadir,line1) endif endif endif diff --git a/lib/mskrtd.f90 b/lib/mskrtd.f90 index 2fd535d6f..b85f60dd2 100644 --- a/lib/mskrtd.f90 +++ b/lib/mskrtd.f90 @@ -1,4 +1,4 @@ -subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall, & +subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, & bshmsg,btrain,pcoeffs,bswl,datadir,line) ! Real-time decoder for MSK144. @@ -18,7 +18,6 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall, & character*37 msglast,msglastswl !Used for dupechecking character*80 line !Formatted line with UTC dB T Freq Msg character*12 mycall,hiscall - character*6 mygrid character*37 recent_shmsgs(NSHMEM) character*512 datadir @@ -72,8 +71,8 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall, & msglastswl=' ' nsnrlast=-99 nsnrlastswl=-99 - mycall13=mycall//' ' - dxcall13=hiscall//' ' + mycall13=mycall//' ' + dxcall13=hiscall//' ' first=.false. endif diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 6ba53ffcc..134c8604c 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -94,9 +94,8 @@ extern "C" { void hspec_(short int d2[], int* k, int* nutc0, int* ntrperiod, int* nrxfreq, int* ntol, bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain, char mycall[], char hiscall[], bool* bshmsg, bool* bswl, char ddir[], float green[], - float s[], int* jh, float *pxmax, float *rmsNoGain, char line[], char mygrid[], - fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, - fortran_charlen_t); + float s[], int* jh, float *pxmax, float *rmsNoGain, char line[], + fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t); void genft8_(char* msg, int* i3, int* n3, char* msgsent, char ft8msgbits[], int itone[], fortran_charlen_t, fortran_charlen_t); @@ -1638,8 +1637,7 @@ void MainWindow::fastSink(qint64 frames) hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&bmsk144, &m_bTrain,m_phaseEqCoefficients.constData(),&m_inGain,&dec_data.params.mycall[0], &dec_data.params.hiscall[0],&bshmsg,&bswl, - &ddir[0],fast_green,fast_s,&fast_jh,&pxmax,&rmsNoGain,&line[0],&dec_data.params.mygrid[0], - 12,12,512,80,6); + &ddir[0],fast_green,fast_s,&fast_jh,&pxmax,&rmsNoGain,&line[0],12,12,512,80); float px = fast_green[fast_jh]; QString t; t.sprintf(" Rx noise: %5.1f ",px);