From edf086c7180b700a86591cc164b9e6cdf228df4f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 25 Nov 2015 14:57:10 +0000 Subject: [PATCH] Code cleanup: don't modify the msg argument passed to packmsg(). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6178 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/Makefile.jt65_Win | 4 ++-- lib/packjt.f90 | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.jt65_Win b/lib/Makefile.jt65_Win index ebaa3f45c..08a4d22cc 100644 --- a/lib/Makefile.jt65_Win +++ b/lib/Makefile.jt65_Win @@ -37,7 +37,7 @@ OBJS1 = astrosub.o astro0.o astro.o sun.o coord.o tmoonsub.o \ symspec.o analytic.o db.o \ encode232.o interleave9.o \ entail.o fano232.o gran.o sync9.o decjt9.o \ - fil3.o decoder.o timer.o \ + fil3.o decoder.o timer.o exp_decode65.o fqso_first.o \ twkfreq.o symspec2.o shell.o sync65.o peakup.o slope.o xcor.o\ fillcom.o chkss2.o zplot9.o flat1.o flat2.o \ jt65a.o symspec65.o flat65.o ccf65.o decode65a.o \ @@ -58,7 +58,7 @@ jt65: $(OBJS7) libjt9.a libsfrsd.a OBJS2 = jt65sim.o wavhdr.o jt65sim: $(OBJS2) libjt9.a - $(FC) -o jt65sim $(OBJS2) -L. -ljt9 + $(FC) -o jt65sim $(OBJS2) -L. -ljt9 C:\JTSDK\fftw3f\libfftw3f-3.dll $(CP) jt65sim.exe $(EXE_DIR) init_rs.o: init_rs.c diff --git a/lib/packjt.f90 b/lib/packjt.f90 index 11090fe2c..8f44d682f 100644 --- a/lib/packjt.f90 +++ b/lib/packjt.f90 @@ -388,7 +388,7 @@ subroutine packbits(dbits,nsymd,m0,sym) 900 return end subroutine unpackgrid - subroutine packmsg(msg,dat,itype) + subroutine packmsg(msg0,dat,itype) ! Packs a JT4/JT9/JT65 message into twelve 6-bit symbols @@ -404,13 +404,14 @@ subroutine packbits(dbits,nsymd,m0,sym) parameter (NBASE=37*36*10*27*27*27) parameter (NBASE2=262178562) - character*22 msg + character*22 msg0,msg integer dat(12) character*12 c1,c2 character*4 c3 character*6 grid6 logical text1,text2,text3 + msg=msg0 itype=1 call fmtmsg(msg,iz)