From d9d9047cb08509b56e4a8c4d1aaabe9a9f7f813f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 23 May 2013 01:05:37 +0000 Subject: [PATCH] Clean up all g95 compiler warnings. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3299 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/Makefile.MinGW | 8 ++++---- lib/decode9.f90 | 2 -- lib/jt9.f90 | 1 + lib/jt9a.F90 | 28 ++++------------------------ lib/jt9code.f90 | 2 -- lib/jt9sim.f90 | 8 ++++---- lib/symspec2.f90 | 5 ++--- lib/unpackbits.f90 | 2 -- mainwindow.cpp | 2 +- 9 files changed, 16 insertions(+), 42 deletions(-) diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW index efbd5b650..f2678f296 100644 --- a/lib/Makefile.MinGW +++ b/lib/Makefile.MinGW @@ -33,13 +33,13 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \ fil3.o redsync.o decoder.o grid2n.o n2grid.o timer.o \ softsym.o getlags.o afc9.o fchisq.o twkfreq.o downsam9.o \ peakdt9.o symspec2.o stdmsg.o morse.o azdist.o geodist.o \ - rig_control.o fillcom.o chkss2.o zplot9.o + fillcom.o chkss2.o zplot9.o libjt9.a: $(OBJS1) ar cr libjt9.a $(OBJS1) ranlib libjt9.a -OBJS2 = jt9.o jt9a.o ipcomm.o sec_midn.o cutil.o +OBJS2 = jt9.o jt9a.o jt9c.o ipcomm.o sec_midn.o cutil.o LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4 jt9.exe: $(OBJS2) libjt9.a g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \ @@ -99,8 +99,8 @@ ipcomm.o: ipcomm.cpp sec_midn.o: sec_midn.f90 $(FC) -c -fno-second-underscore sec_midn.f90 -rig_control.o: rig_control.c - $(CC) -c -Wall -I..\..\..\hamlib-1.2.15.3\include rig_control.c +#rig_control.o: rig_control.c +# $(CC) -c -Wall -I..\..\..\hamlib-1.2.15.3\include rig_control.c tstrig.o: tstrig.c $(CC) -c -Wall -I..\..\..\hamlib-1.2.15.3\include tstrig.c diff --git a/lib/decode9.f90 b/lib/decode9.f90 index d4ad26d76..b68d742c8 100644 --- a/lib/decode9.f90 +++ b/lib/decode9.f90 @@ -13,10 +13,8 @@ subroutine decode9(i1SoftSymbols,limit,nlim,msg) real*4 xx0(0:255) - integer*1 i1 logical first integer*4 mettab(0:255,0:1) - equivalence (i1,i4) data first/.true./ data xx0/ & 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, & diff --git a/lib/jt9.f90 b/lib/jt9.f90 index 4ce710819..a82faf430 100644 --- a/lib/jt9.f90 +++ b/lib/jt9.f90 @@ -51,6 +51,7 @@ program jt9 call getarg(ifile,infile) open(10,file=infile,access='stream',status='old',err=998) read(10) ihdr + nutc0=ihdr(1) !Silence compiler warning i1=index(infile,'.wav') read(infile(i1-4:i1-1),*,err=1) nutc0 go to 2 diff --git a/lib/jt9a.F90 b/lib/jt9a.F90 index b9d8882aa..f4d4dc473 100644 --- a/lib/jt9a.F90 +++ b/lib/jt9a.F90 @@ -8,7 +8,8 @@ subroutine jt9a end function address_jt9 end interface - integer*1 attach_jt9,lock_jt9,unlock_jt9 + integer*1 attach_jt9 +! integer*1 lock_jt9,unlock_jt9 integer size_jt9 integer*1, pointer :: p_jt9 character*80 cwd @@ -31,9 +32,10 @@ subroutine jt9a inquire(file=trim(cwd)//'/.quit',exist=fileExists) if(fileExists) then ! call ftnquit - i=detach_jt9() + i1=detach_jt9() go to 999 endif + if(i1.eq.999999) stop !Silence compiler warning nbytes=size_jt9() if(nbytes.le.0) then @@ -64,25 +66,3 @@ subroutine jt9b(jt9com,nbytes) call jt9c(jt9com(kss),jt9com(ksavg),jt9com(kc0),jt9com(kid2),jt9com(knutc)) return end subroutine jt9b - -subroutine jt9c(ss,savg,c0,id2,nparams0) - parameter (NTMAX=120) - parameter (NSMAX=1365) - integer*1 detach_jt9 - real*4 ss(184*NSMAX),savg(NSMAX) - complex c0(NTMAX*1500) - integer*2 id2(NTMAX*12000) - - integer nparams0(21),nparams(21) - character*20 datetime - common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfb,ntol, & - kin,nzhsym,nsave,nagain,ndepth,nrxlog,nfsample,datetime - equivalence (nparams,nutc) - - nparams=nparams0 !Copy parameters into common/npar/ - - call flush(6) - if(sum(nparams).ne.0) call decoder(ss,c0,0) - - return -end subroutine jt9c diff --git a/lib/jt9code.f90 b/lib/jt9code.f90 index 8201f6d13..a4f0d3e79 100644 --- a/lib/jt9code.f90 +++ b/lib/jt9code.f90 @@ -4,8 +4,6 @@ program jt9code character msg*22,msg0*22,decoded*22 integer*4 i4tone(85) !Channel symbols (values 0-8) - integer*1 i1 - equivalence (i1,i4) include 'jt9sync.f90' nargs=iargc() diff --git a/lib/jt9sim.f90 b/lib/jt9sim.f90 index 7321a0726..f4f0cf62f 100644 --- a/lib/jt9sim.f90 +++ b/lib/jt9sim.f90 @@ -14,8 +14,6 @@ program jt9sim integer*1 i1ScrambledBits(207) !Unpacked bits, scrambled order integer*1 i1Bits(207) !Encoded information-carrying bits integer*1 i1SoftSymbols(207) - integer*1 i1 - equivalence (i1,i4) include 'jt9sync.f90' common/acom/dat(NMAX),iwave(NMAX) @@ -56,13 +54,14 @@ program jt9sim if(minutes.eq.30) nsps=252000 if(nsps.eq.0) stop 'Bad value for minutes.' - f0=1400.d0 !Center frequency (MHz) + f0=1400.d0 !Center frequency (Hz) ! f0=1500.0 ! if(minutes.eq.5) f0=1100. ! if(minutes.eq.10) f0=1050. ! if(minutes.eq.30) f0=1025. ihdr=0 !Temporary ### + k=0 !Silence compiler warning if(msg0(1:3).eq.'sin') read(msg0(4:),*) sinfreq @@ -155,7 +154,8 @@ program jt9sim i4=-10 if(i1Bits(i).eq.1) i4=10 i4=i4+128 - i1SoftSymbols(i)=i1 + if(i4.le.127) i1SoftSymbols(k)=i4 + if(i4.ge.128) i1SoftSymbols(k)=i4-256 enddo limit=1000 call decode9(i1SoftSymbols,limit,nlim,msg) diff --git a/lib/symspec2.f90 b/lib/symspec2.f90 index bfe6c7fa7..1120b52fd 100644 --- a/lib/symspec2.f90 +++ b/lib/symspec2.f90 @@ -9,8 +9,6 @@ subroutine symspec2(c5,nz3,nsps8,nspsd,fsample,freq,drift,snrdb,schk, & real aa(3) real ss2(0:8,85) real ss3(0:7,69) - integer*1 i1 - equivalence (i1,i4) include 'jt9sync.f90' aa(1)=-1500.0/nsps8 @@ -83,7 +81,8 @@ subroutine symspec2(c5,nz3,nsps8,nspsd,fsample,freq,drift,snrdb,schk, & if(i4.lt.-127) i4=-127 if(i4.gt.127) i4=127 i4=i4+128 - i1SoftSymbolsScrambled(k)=i1 + if(i4.le.127) i1SoftSymbolsScrambled(k)=i4 + if(i4.ge.128) i1SoftSymbolsScrambled(k)=i4-256 enddo enddo diff --git a/lib/unpackbits.f90 b/lib/unpackbits.f90 index 2d8508704..a3ff15f14 100644 --- a/lib/unpackbits.f90 +++ b/lib/unpackbits.f90 @@ -6,8 +6,6 @@ subroutine unpackbits(sym,nsymd,m0,dbits) integer sym(nsymd) integer*1 dbits(*) - integer*1 n1 - equivalence (n,n1) k=0 do i=1,nsymd diff --git a/mainwindow.cpp b/mainwindow.cpp index 164b49bd1..291882563 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"