Merge branch 'master' of https://github.com/mdblack98/Hamlib

src/parallel.c

@@ -126,8 +126,8 @@
  */
 int par_open(hamlib_port_t *port)
 {
-#ifdef HAVE_LINUX_PPDEV_H
     int fd;
+#ifdef HAVE_LINUX_PPDEV_H
     int mode;
 #endif
 

tests/ampctl_parse.c

@@ -862,9 +862,6 @@ int ampctl_parse(AMP *my_amp, FILE *fin, FILE *fout, char *argv[], int argc)
         rp_hist_buf = (char *)calloc(896, sizeof(char));
 #endif
 
-        rl_instream = fin;
-        rl_outstream = fout;
-
         rp_getline("\nAmplifier command: ");
 
         /* EOF (Ctl-D) received on empty input line, bail out gracefully. */

tests/rigctl_parse.c

@@ -1019,9 +1019,6 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
         rp_hist_buf = (char *)calloc(512, sizeof(char));
 #endif
 
-        rl_instream = fin;
-        rl_outstream = fout;
-
         rp_getline("\nRig command: ");
 
         /* EOF (Ctl-D) received on empty input line, bail out gracefully. */

tests/rotctl_parse.c

@@ -910,9 +910,6 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc,
         rp_hist_buf = (char *)calloc(896, sizeof(char));
 #endif
 
-        rl_instream = fin;
-        rl_outstream = fout;
-
         rp_getline("\nRotator command: ");
 
         /* EOF (Ctl-D) received on empty input line, bail out gracefully. */