diff --git a/Makefile.in b/Makefile.in index e597b6f96..1885e5ceb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,10 +75,8 @@ INCLTDL = @INCLTDL@ INCLUDES = @INCLUDES@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LIBLTDL = @LIBLTDL@ -LIBOBJS = @LIBOBJS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MATH_LIBS = @MATH_LIBS@ NET = @NET@ diff --git a/THANKS b/THANKS index 996c102d5..ffd70d2ee 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,8 @@ +This file lists people who contributed indirectly to Hamlib, by generously +making information available. Be they thanked for their openness. + + WiNRADiO backend ---------------- diff --git a/lib/Makefile.am b/lib/Makefile.am index 23a96cce8..9b3de97a6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,4 +3,4 @@ EXTRA_DIST = getopt.c getopt.h getopt_long.c usleep.c noinst_LTLIBRARIES = libmisc.la libmisc_la_SOURCES = -libmisc_la_LIBADD = @LTLIBOBJS@ +libmisc_la_LIBADD = @LIBOBJS@ diff --git a/src/iofunc.c b/src/iofunc.c index 33d025884..8d78a52ab 100644 --- a/src/iofunc.c +++ b/src/iofunc.c @@ -2,7 +2,7 @@ * Hamlib Interface - generic file based io functions * Copyright (c) 2000-2002 by Stephane Fillod and Frank Singleton * - * $Id: iofunc.c,v 1.4 2002-04-23 22:03:51 fillods Exp $ + * $Id: iofunc.c,v 1.5 2002-06-17 20:59:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -304,8 +304,8 @@ int read_string(port_t *p, char *rxbuffer, size_t rxmax, const char *stopset, if (retval < 0) { dump_hex(rxbuffer, total_count); - rig_debug(RIG_DEBUG_ERR,__FUNCTION__": select error after %d chars:" - " %s\n", total_count, strerror(errno)); + rig_debug(RIG_DEBUG_ERR, "%s: select error after %d chars: %s\n", + __FUNCTION__, total_count, strerror(errno)); return -RIG_EIO; } /* diff --git a/src/misc.c b/src/misc.c index 27bbb044b..d418ae082 100644 --- a/src/misc.c +++ b/src/misc.c @@ -2,7 +2,7 @@ * Hamlib Interface - toolbox * Copyright (c) 2000-2002 by Stephane Fillod and Frank Singleton * - * $Id: misc.c,v 1.16 2002-04-23 21:53:59 fillods Exp $ + * $Id: misc.c,v 1.17 2002-06-17 20:59:51 fillods Exp $ * * This library is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as @@ -267,7 +267,6 @@ const char * strmode(rmode_t mode) case RIG_MODE_FM: return "FM"; case RIG_MODE_WFM: return "WFM"; case RIG_MODE_NONE: return ""; - default: } return NULL; } @@ -330,7 +329,6 @@ const char *strfunc(setting_t func) case RIG_FUNC_RESUME: return "RESUME"; case RIG_FUNC_NONE: return ""; - default: } return NULL; } @@ -368,7 +366,6 @@ const char *strlevel(setting_t level) case RIG_LEVEL_STRENGTH: return "STRENGTH"; case RIG_LEVEL_NONE: return ""; - default: } return NULL; } @@ -384,7 +381,6 @@ const char *strparm(setting_t parm) case RIG_PARM_BAT: return "BAT"; case RIG_PARM_NONE: return ""; - default: } return NULL; } @@ -396,7 +392,6 @@ const char *strptrshift(rptr_shift_t shift) case RIG_RPT_SHIFT_PLUS: return "-"; case RIG_RPT_SHIFT_NONE: return "None"; - default: } return NULL; } @@ -417,7 +412,6 @@ const char *strvfop(vfo_op_t op) case RIG_OP_RIGHT: return "RIGHT"; case RIG_OP_NONE: return ""; - default: } return NULL; } @@ -430,7 +424,6 @@ const char *strscan(scan_t scan) case RIG_SCAN_SLCT: return "SLCT"; case RIG_SCAN_PRIO: return "PRIO"; case RIG_SCAN_DELTA: return "DELTA"; - default: } return NULL; } diff --git a/tcl/tcltest.tcl b/tcl/tcltest.tcl index 61f7ca5e8..bb8f2b93c 100755 --- a/tcl/tcltest.tcl +++ b/tcl/tcltest.tcl @@ -12,6 +12,7 @@ set my_rig [rig init 1] $my_rig open $my_rig set_freq 145550000 puts [$my_rig get_strength] +puts [$my_rig get_level STRENGTH] $my_rig close $my_rig cleanup diff --git a/tests/testtrn.c b/tests/testtrn.c index 2cb9be20c..86b596f87 100644 --- a/tests/testtrn.c +++ b/tests/testtrn.c @@ -75,7 +75,10 @@ int main (int argc, char *argv[]) for (i=0;i<12;i++) - sleep(10); /* or anything smarter */ + { + printf("Loop count: %d\n", i); + sleep(10); /* or anything smarter */ + } printf("Frequency changed %d times\n", count);