From f976d3201363d32e71ec8a863063d741bd098416 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 24 Jan 2023 09:18:00 -0500
Subject: [PATCH] Clean up some compiler warnings.

---
 lib/fst4_decode.f90                  | 1 +
 lib/ft8/sync8.f90                    | 3 +--
 lib/ft8_decode.f90                   | 6 ++----
 lib/qra/q65/q65_encoding_modules.f90 | 4 +---
 q65w/libq65/recvpkt.f90              | 6 ++----
 q65w/soundin.cpp                     | 3 +--
 q65w/soundin.h                       | 3 +--
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/lib/fst4_decode.f90 b/lib/fst4_decode.f90
index 5d9ccc827..a9c7d80f9 100644
--- a/lib/fst4_decode.f90
+++ b/lib/fst4_decode.f90
@@ -602,6 +602,7 @@ contains
                         case(1800) 
                            snr_calfac=320.0
                         case default
+                           snr_calfac=430.0
                      end select
                      arg=snr_calfac*xsig/base - 1.0
                      if(arg.gt.0.0) then
diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90
index f93afe75a..7aff8f091 100644
--- a/lib/ft8/sync8.f90
+++ b/lib/ft8/sync8.f90
@@ -1,5 +1,4 @@
-subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,nzhsym,candidate,   &
-     ncand,sbase)
+subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase)
 
   include 'ft8_params.f90'
   parameter (MAXPRECAND=1000)
diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90
index a19d0b83c..9d3ae75f8 100644
--- a/lib/ft8_decode.f90
+++ b/lib/ft8_decode.f90
@@ -46,7 +46,6 @@ contains
     procedure(ft8_decode_callback) :: callback
     parameter (MAXCAND=600,MAX_EARLY=100)
     real*8 tsec,tseq
-    real s(NH1,NHSYM)
     real sbase(NH1)
     real candidate(3,MAXCAND)
     real dd(15*12000),dd1(15*12000)
@@ -68,7 +67,7 @@ contains
     real xdt_save(MAX_EARLY)
     data nutc0/-1/
 
-    save s,dd,dd1,nutc0,ndec_early,itone_save,f1_save,xdt_save,lsubtracted,&
+    save dd,dd1,nutc0,ndec_early,itone_save,f1_save,xdt_save,lsubtracted,  &
          allmessages
     
     this%callback => callback
@@ -193,8 +192,7 @@ contains
       endif 
       call timer('sync8   ',0)
       maxc=MAXCAND
-      call sync8(dd,ifa,ifb,syncmin,nfqso,maxc,nzhsym,candidate,   &
-           ncand,sbase)
+      call sync8(dd,ifa,ifb,syncmin,nfqso,maxc,candidate,ncand,sbase)
       call timer('sync8   ',1)
       do icand=1,ncand
         sync=candidate(3,icand)
diff --git a/lib/qra/q65/q65_encoding_modules.f90 b/lib/qra/q65/q65_encoding_modules.f90
index b55c7f27b..4988dd4d4 100644
--- a/lib/qra/q65/q65_encoding_modules.f90
+++ b/lib/qra/q65/q65_encoding_modules.f90
@@ -135,10 +135,9 @@ end
 
 subroutine get_q65crc12(mc2,ncrc1,ncrc2)
 !
-   character c12*12,c6*6
+   character c6*6
    integer*1 mc(90),mc2(90),tmp(6)
    integer*1 r(13),p(13)
-   integer ncrc
 ! polynomial for 12-bit CRC 0xF01
    data p/1,1,0,0,0,0,0,0,0,1,1,1,1/
 
@@ -170,7 +169,6 @@ subroutine get_q65_tones(msg37,codeword,itone)
    implicit none
    character*37 msg37
    character*77 c77
-   character*12 c12
    character*6  c6
    integer codeword(65)
    integer sync(22)
diff --git a/q65w/libq65/recvpkt.f90 b/q65w/libq65/recvpkt.f90
index e0df94e7a..e0c434440 100644
--- a/q65w/libq65/recvpkt.f90
+++ b/q65w/libq65/recvpkt.f90
@@ -1,4 +1,4 @@
-subroutine recvpkt(nsam,nblock2,userx_no,k,buf4,buf8,buf16)
+subroutine recvpkt(nsam,nblock2,userx_no,k,buf4,buf8)
 
 ! Reformat timf2 data from Linrad and stuff data into r*4 array dd().
 
@@ -8,15 +8,13 @@ subroutine recvpkt(nsam,nblock2,userx_no,k,buf4,buf8,buf16)
   integer*1 userx_no
   real*4 d4,buf4(*)                   !(348)
   real*8 d8,buf8(*)                   !(174)
-  complex*16 c16,buf16(*)             !(87)
   integer*2 jd(4),kd(2),nblock2
-  real*4 xd(4),yd(2)
+  real*4 yd(2)
   real*8 fcenter
   common/datcom/dd(2,5760000),ss(322,NFFT),savg(NFFT),fcenter,nutc,  &
        junk(NJUNK)
   equivalence (kd,d4)
   equivalence (jd,d8,yd)
-  equivalence (xd,c16)
 
   if(nblock2.eq.-9999) nblock2=-9998    !Silence a compiler warning
   if(nsam.eq.-1) then
diff --git a/q65w/soundin.cpp b/q65w/soundin.cpp
index 54fbc5955..d6ba6e56a 100644
--- a/q65w/soundin.cpp
+++ b/q65w/soundin.cpp
@@ -209,8 +209,7 @@ void SoundInThread::inputUDP()
         // If buffer will not overflow, move data into datcom_
         if ((k+iz) <= 60*96000) {
           int nsam=-1;
-          recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8, b.d8);
-//          if(nsam==-99) recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8, b.d8);
+          recvpkt_(&nsam, &b.iblk, &b.nrx, &k, b.d8, b.d8);
           datcom_.fcenter=b.cfreq + m_fAdd;
         }
 
diff --git a/q65w/soundin.h b/q65w/soundin.h
index 2773bc9d4..a0900ba6e 100644
--- a/q65w/soundin.h
+++ b/q65w/soundin.h
@@ -67,8 +67,7 @@ private:
 };
 
 extern "C" {
-  void recvpkt_(int* nsam, quint16* iblk, qint8* nrx, int* k, double s1[],
-                double s2[], double s3[]);
+  void recvpkt_(int* nsam, quint16* iblk, qint8* nrx, int* k, double s1[], double s2[]);
 }
 
 #endif // SOUNDIN_H