From 4be4b7033b48303e03233285181de322fce95dca Mon Sep 17 00:00:00 2001
From: Michael Black <mdblack98@yahoo.com>
Date: Wed, 15 Jan 2020 07:04:40 -0600
Subject: [PATCH] Clean up HAVE_LIBREADLINE mods

---
 tests/ampctl.c       | 3 ---
 tests/ampctl_parse.c | 7 +------
 tests/rigctl.c       | 3 ---
 tests/rigctl_parse.c | 2 --
 tests/rotctl_parse.c | 5 +----
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/tests/ampctl.c b/tests/ampctl.c
index 2756c401a..2f2e138b9 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -411,8 +411,6 @@ int main(int argc, char *argv[])
     }
     while (retcode == 0 || retcode == 2);
 
-#ifdef HAVE_LIBREADLINE
-
     if (interactive && prompt)
     {
 #ifdef HAVE_READLINE_HISTORY
@@ -436,7 +434,6 @@ int main(int argc, char *argv[])
 #endif  /* HAVE_READLINE_HISTORY */
     }
 
-#endif  /* HAVE_LIBREADLINE */
     amp_close(my_amp);   /* close port */
     amp_cleanup(my_amp); /* if you care about memory */
 
diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c
index 7d562a9f8..88f8bd462 100644
--- a/tests/ampctl_parse.c
+++ b/tests/ampctl_parse.c
@@ -478,9 +478,7 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
 #endif
 
     /* cmd, internal, ampctld */
-#ifdef HAVE_LIBREADLINE
     if (!(interactive && prompt && have_rl))
-#endif
     {
         if (interactive)
         {
@@ -852,8 +850,8 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
     }
 
 #ifdef HAVE_LIBREADLINE
-
     if (interactive && prompt && have_rl)
+#endif
     {
         int j, x;
 
@@ -1334,9 +1332,6 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
 #endif
     }
 
-#endif  /* HAVE_LIBREADLINE */
-
-
     /*
      * mutex locking needed because ampctld is multithreaded
      * and hamlib is not MT-safe
diff --git a/tests/rigctl.c b/tests/rigctl.c
index d448695b4..66705ac5f 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -618,8 +618,6 @@ int main(int argc, char *argv[])
     }
     while (retcode == 0 || retcode == 2 || retcode == -RIG_ENAVAIL);
 
-#ifdef HAVE_LIBREADLINE
-
     if (interactive && prompt)
     {
 #ifdef HAVE_READLINE_HISTORY
@@ -643,7 +641,6 @@ int main(int argc, char *argv[])
 #endif  /* HAVE_READLINE_HISTORY */
     }
 
-#endif  /* HAVE_LIBREADLINE */
     rig_close(my_rig);   /* close port */
     rig_cleanup(my_rig); /* if you care about memory */
 
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 18cf3d641..1a8636642 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -605,9 +605,7 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
     vfo_t vfo = RIG_VFO_CURR;
 
     /* cmd, internal, rigctld */
-#ifdef HAVE_LIBREADLINE
     if (!(interactive && prompt && have_rl))
-#endif
     {
 
         if (interactive)
diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
index 04b360f8e..c8d7c615b 100644
--- a/tests/rotctl_parse.c
+++ b/tests/rotctl_parse.c
@@ -898,8 +898,8 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
     }
 
 #ifdef HAVE_LIBREADLINE
-
     if (interactive && prompt && have_rl)
+#endif
     {
         int j, x;
 
@@ -1379,9 +1379,6 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
 #endif
     }
 
-#endif  /* HAVE_LIBREADLINE */
-
-
     /*
      * mutex locking needed because rotctld is multithreaded
      * and hamlib is not MT-safe