[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 3d7ddc7e034d636b99afb
Library to control radio transceivers and receivers
Brought to you by:
n0nb
Menu
▾
▴
[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 3d7ddc7e034d636b99afb5efec51f586117aed0a
|
From: Michael B. <mdb...@us...> - 2020-07-03 22:25:30
|
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 3d7ddc7e034d636b99afb5efec51f586117aed0a (commit)
via 57c76ed3c4ae8d022b3c42f4c1b7c72a63dae24a (commit)
via 557eff4f65784d1f0bffa16f9e342fe0018aa0c0 (commit)
via 045c0cff2124de134cc20c0fdb3525cb7e46af62 (commit)
via 0ecf32f2a72f5d6dc29c72f0f22ed4c6dfb9d971 (commit)
via 2e0c5f568767bccbf6fb6fcf87e12296f528b932 (commit)
via a3bb987e23479c7aca3f719336fe5c0c63bb2399 (commit)
from 0c2b39c2e08d5b549058715785d5a837d83de15e (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 3d7ddc7e034d636b99afb5efec51f586117aed0a
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 17:14:09 2020 -0500
Fix cppcheck warnings
diff --git a/src/register.c b/src/register.c
index 0515fe87..659b91fa 100644
--- a/src/register.c
+++ b/src/register.c
@@ -299,7 +299,7 @@ int HAMLIB_API rig_check_backend(rig_model_t rig_model)
if (be_idx == -1)
{
rig_debug(RIG_DEBUG_VERBOSE,
- "rig_check_backend: unsupported backend %d for model %u\n",
+ "rig_check_backend: unsupported backend %u for model %u\n",
RIG_BACKEND_NUM(rig_model),
rig_model);
return -RIG_ENAVAIL;
commit 57c76ed3c4ae8d022b3c42f4c1b7c72a63dae24a
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 17:10:25 2020 -0500
Fix cppcheck warnings
diff --git a/rotators/rotorez/rotorez.c b/rotators/rotorez/rotorez.c
index 015c2165..36d684c3 100644
--- a/rotators/rotorez/rotorez.c
+++ b/rotators/rotorez/rotorez.c
@@ -552,7 +552,7 @@ static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth,
err = -RIG_EINVAL;
}
}
- else if (err == AZ_READ_LEN && az[0] == ';')
+ else if (err == AZ_READ_LEN)
{
/* Check if remaining chars are digits if az[0] == ';' */
for (p = az + 1; p < az + 4; p++)
commit 557eff4f65784d1f0bffa16f9e342fe0018aa0c0
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 17:01:49 2020 -0500
Fix cppcheck warnings
diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index f71b2d11..098f47c1 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -1488,7 +1488,7 @@ int adat_get_single_cmd_result(RIG *pRig)
pcPos = acBuf;
- if ((nRC == RIG_OK) && (pcPos != NULL))
+ if ((nRC == RIG_OK))
{
int nBufLength = 0;
commit 045c0cff2124de134cc20c0fdb3525cb7e46af62
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 16:59:52 2020 -0500
Fix cppcheck warnings
diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c
index d8b5a116..89a5dd32 100644
--- a/dummy/netrigctl.c
+++ b/dummy/netrigctl.c
@@ -718,7 +718,7 @@ static int netrigctl_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
return (ret < 0) ? ret : -RIG_EPROTO;
}
- if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
+ if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
*mode = rig_parse_mode(buf);
@@ -790,7 +790,7 @@ static int netrigctl_get_vfo(RIG *rig, vfo_t *vfo)
return (ret < 0) ? ret : -RIG_EPROTO;
}
- if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
+ if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
*vfo = rig_parse_vfo(buf);
@@ -935,7 +935,7 @@ static int netrigctl_get_rptr_shift(RIG *rig, vfo_t vfo,
return (ret < 0) ? ret : -RIG_EPROTO;
}
- if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
+ if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
*rptr_shift = rig_parse_rptr_shift(buf);
@@ -1329,7 +1329,7 @@ static int netrigctl_get_split_mode(RIG *rig, vfo_t vfo, rmode_t *tx_mode,
return (ret < 0) ? ret : -RIG_EPROTO;
}
- if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
+ if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
*tx_mode = rig_parse_mode(buf);
@@ -1407,7 +1407,7 @@ static int netrigctl_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split,
}
- if (ret > 0 && buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
+ if (buf[ret - 1] == '\n') { buf[ret - 1] = '\0'; } /* chomp */
*tx_vfo = rig_parse_vfo(buf);
commit 0ecf32f2a72f5d6dc29c72f0f22ed4c6dfb9d971
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 16:56:59 2020 -0500
Fix cppcheck warning
diff --git a/dummy/flrig.c b/dummy/flrig.c
index 2fecbdb9..c26b00d3 100644
--- a/dummy/flrig.c
+++ b/dummy/flrig.c
@@ -376,7 +376,7 @@ static char *xml_parse(char *xml, char *value, int value_len)
xml_parse2(next, value, value_len);
}
- if (strstr(value, "faultString"))
+ if ( value && strstr(value, "faultString"))
{
rig_debug(RIG_DEBUG_ERR, "%s error:\n%s\n", __func__, value);
value[0] = 0; /* truncate to give empty response */
commit 2e0c5f568767bccbf6fb6fcf87e12296f528b932
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 16:20:23 2020 -0500
Fix cppcheck warnings
diff --git a/src/misc.c b/src/misc.c
index a4efb69e..a2ef2246 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1382,7 +1382,7 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
{
unsigned int net1, net2, net3, net4, net5, net6, net7, net8;
- char dummy[2], link[32], *p;
+ char dummy[6], link[32], *p;
host[0] = 0;
port[0] = 0;
dummy[0] = 0;
@@ -1471,7 +1471,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
return RIG_OK;
}
- if (sscanf(hoststr, ":%5[0-9]%s", port,
+ if (sscanf(hoststr, ":%5[0-9]%1s", port,
dummy) == 1) // just a port if you please
{
sprintf(hoststr, "%s:%s\n", "localhost", port);
commit a3bb987e23479c7aca3f719336fe5c0c63bb2399
Author: Michael Black W9MDB <mdb...@ya...>
Date: Fri Jul 3 16:17:59 2020 -0500
Fix cppcheck warnings
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 027ad8ca..ced515e3 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -629,7 +629,6 @@ static int ft817_get_status(RIG *rig, int status)
int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{
struct ft817_priv_data *p = (struct ft817_priv_data *) rig->state.priv;
- int n;
freq_t f1 = 0, f2 = 0;
int retries = rig->state.rigport.retry +
1; // +1 because, because 2 steps are needed even in best scenario
@@ -638,6 +637,7 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
while ((f1 == 0 || f1 != f2) && retries-- > 0)
{
+ int n;
rig_debug(RIG_DEBUG_TRACE, "%s: retries=%d\n", __func__, retries);
if ((n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_FREQ_MODE_STATUS)) < 0)
@@ -955,13 +955,11 @@ int ft817_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd)
int ft817_read_ack(RIG *rig)
{
char dummy;
- int n;
-
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
if (rig->state.rigport.post_write_delay == 0)
{
- if ((n = read_block(&rig->state.rigport, &dummy, 1)) < 0)
+ if (read_block(&rig->state.rigport, &dummy, 1) < 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: error reading ack\n", __func__);
rig_debug(RIG_DEBUG_ERR, "%s: adjusting post_write_delay to avoid ack\n",
-----------------------------------------------------------------------
Summary of changes:
dummy/flrig.c | 2 +-
dummy/netrigctl.c | 10 +++++-----
rigs/adat/adat.c | 2 +-
rigs/yaesu/ft817.c | 6 ++----
rotators/rotorez/rotorez.c | 2 +-
src/misc.c | 4 ++--
src/register.c | 2 +-
7 files changed, 13 insertions(+), 15 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
