[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 6e8b90aeec93ae249acc7
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 6e8b90aeec93ae249acc77a6ca72acb5808231ea
|
From: Michael B. <mdb...@us...> - 2021-01-10 05:15:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via 6e8b90aeec93ae249acc77a6ca72acb5808231ea (commit)
via b79fdc0587514d27ed58d9318eb47ffd4d3ca82d (commit)
via d475dc81a3b347ee907398760204d0e517f9d355 (commit)
via 17a37be2c286ae226f4cb8752dc5c5cc647efa32 (commit)
via a4d9e61f5afc093a52c30ab408cc7dd8261d1d95 (commit)
from ca8ed30f8f39745941b1b7c1d4031e9bf246e144 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6e8b90aeec93ae249acc77a6ca72acb5808231ea
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Jan 9 15:19:19 2021 -0600
Fix cppcheck warnings
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 672da1ed..f06b5b31 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -222,7 +222,7 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
sprintf((char *) cmd_buf, "PC%04dR%08.0lfT%08.0lf", chan, freq, freq);
retval = barrett_transaction(rig, cmd_buf, 0, &response);
- if (strncmp(response, "OK", 2) != 0)
+ if (retval != RIG_OK || strncmp(response, "OK", 2) != 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: Expected OK, got '%s'\n", __func__, response);
return -RIG_EPROTO;
diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index 553a0c63..c6d657aa 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -306,8 +306,8 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
int retval, retry;
rig_debug(RIG_DEBUG_VERBOSE,
- "%s: cmd=0x%02x, subcmd=0x%02x, payload_len=%d, data_len=%d\n", __func__,
- cmd, subcmd, payload_len, *data_len);
+ "%s: cmd=0x%02x, subcmd=0x%02x, payload_len=%d\n", __func__,
+ cmd, subcmd, payload_len);
retry = rig->state.rigport.retry;
diff --git a/rigs/winradio/g305.c b/rigs/winradio/g305.c
index 7e2a5643..b5fa2430 100644
--- a/rigs/winradio/g305.c
+++ b/rigs/winradio/g305.c
@@ -272,11 +272,10 @@ int g3_cleanup(RIG *rig)
{
struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv;
- /* Clean up the dll access */
- FreeLibrary(priv->dll);
-
- if (rig->state.priv)
+ if (priv)
{
+ /* Clean up the dll access */
+ FreeLibrary(priv->dll);
free(rig->state.priv);
}
diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c
index ba09ec56..f9d096bf 100644
--- a/rigs/winradio/g313-posix.c
+++ b/rigs/winradio/g313-posix.c
@@ -306,10 +306,7 @@ int g313_cleanup(RIG *rig)
dlclose(priv->hWRAPI);
}
- if (rig->state.priv)
- {
- free(rig->state.priv);
- }
+ free(rig->state.priv);
rig->state.priv = NULL;
return RIG_OK;
diff --git a/rigs/winradio/g313-win.c b/rigs/winradio/g313-win.c
index abc99cf3..2134d520 100644
--- a/rigs/winradio/g313-win.c
+++ b/rigs/winradio/g313-win.c
@@ -469,11 +469,7 @@ int g313_cleanup(RIG *rig)
FreeLibrary(priv->WinMM);
FreeLibrary(priv->hWRG313WO);
-
- if (rig->state.priv)
- {
- free(rig->state.priv);
- }
+ free(rig->state.priv);
rig->state.priv = NULL;
diff --git a/src/rig.c b/src/rig.c
index dfd9ac90..b740af56 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -437,6 +437,7 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model)
if (RIG_IS_FRNG_END(rs->rx_range_list[0]))
{
rig_debug(RIG_DEBUG_ERR, "%s: rig does not have rx_range!!\n", __func__);
+ return NULL;
}
#if 0 // this is no longer applicable -- replace it with something?
diff --git a/tests/testrig.c b/tests/testrig.c
index a2a8e890..f6c526c1 100644
--- a/tests/testrig.c
+++ b/tests/testrig.c
@@ -15,7 +15,7 @@
# include "config.h"
#endif
-#define SERIAL_PORT "/dev/ttyUSB0"
+#define SERIAL_PORT "/dev/pts/3"
int main(int argc, char *argv[])
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
printf("testrig: Hello, I am your main() !\n");
/* Turn off backend debugging output */
- rig_set_debug_level(RIG_DEBUG_NONE);
+ rig_set_debug_level(RIG_DEBUG_ERR);
/*
* allocate memory, setup & open port
@@ -66,10 +66,13 @@ int main(int argc, char *argv[])
if (!my_rig)
{
- fprintf(stderr, "Unknown rig num: %d\n", myrig_model);
- fprintf(stderr, "Please check riglist.h\n");
+ fprintf(stderr, "Rig Not OK!!!\n");
+ //fprintf(stderr, "Unknown rig num: %d\n", myrig_model);
+ //fprintf(stderr, "Please check riglist.h\n");
exit(1); /* whoops! something went wrong (mem alloc?) */
}
+ fprintf(stderr, "Rig OK\n");
+ exit(0);
strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, FILPATHLEN - 1);
commit b79fdc0587514d27ed58d9318eb47ffd4d3ca82d
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Jan 9 12:06:40 2021 -0600
Fix potential null reference in dttsp.c
diff --git a/rigs/winradio/g303.c b/rigs/winradio/g303.c
index 67dceb78..dda2c5cc 100644
--- a/rigs/winradio/g303.c
+++ b/rigs/winradio/g303.c
@@ -272,7 +272,7 @@ int g3_cleanup(RIG *rig)
struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv;
/* Clean up the dll access */
- FreeLibrary(priv->dll);
+ if (priv) FreeLibrary(priv->dll);
if (rig->state.priv)
{
commit d475dc81a3b347ee907398760204d0e517f9d355
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Jan 9 12:05:49 2021 -0600
Fix potential null reference in dttsp.c
diff --git a/rigs/kit/elektor507.c b/rigs/kit/elektor507.c
index 8237830a..fcca4a2f 100644
--- a/rigs/kit/elektor507.c
+++ b/rigs/kit/elektor507.c
@@ -345,7 +345,7 @@ int elektor507_cleanup(RIG *rig)
rig->state.priv;
/* Clean up the dll access */
- FreeLibrary(priv->extra_priv.dll);
+ if (priv) FreeLibrary(priv->extra_priv.dll);
if (rig->state.priv)
{
commit 17a37be2c286ae226f4cb8752dc5c5cc647efa32
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Jan 9 12:05:00 2021 -0600
Fix potential null reference in dttsp.c
diff --git a/rigs/kit/dwt.c b/rigs/kit/dwt.c
index 110da9d8..65252db5 100644
--- a/rigs/kit/dwt.c
+++ b/rigs/kit/dwt.c
@@ -342,7 +342,7 @@ int dwtdll_cleanup(RIG *rig)
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
/* Clean up the dll access */
- FreeLibrary(priv->dll);
+ if (priv) FreeLibrary(priv->dll);
if (rig->state.priv)
{
commit a4d9e61f5afc093a52c30ab408cc7dd8261d1d95
Author: Michael Black W9MDB <mdb...@ya...>
Date: Sat Jan 9 12:03:29 2021 -0600
Fix potential null reference in dttsp.c
diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c
index 84ac4196..b9ad58ad 100644
--- a/rigs/flexradio/dttsp.c
+++ b/rigs/flexradio/dttsp.c
@@ -660,7 +660,7 @@ int dttsp_cleanup(RIG *rig)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
- if (priv->tuner)
+ if (priv && priv->tuner)
{
rig_cleanup(priv->tuner);
}
-----------------------------------------------------------------------
Summary of changes:
rigs/barrett/950.c | 2 +-
rigs/flexradio/dttsp.c | 2 +-
rigs/icom/frame.c | 4 ++--
rigs/kit/dwt.c | 2 +-
rigs/kit/elektor507.c | 2 +-
rigs/winradio/g303.c | 2 +-
rigs/winradio/g305.c | 7 +++----
rigs/winradio/g313-posix.c | 5 +----
rigs/winradio/g313-win.c | 6 +-----
src/rig.c | 1 +
tests/testrig.c | 11 +++++++----
11 files changed, 20 insertions(+), 24 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
