From 3b581bdc6bb98b94230a6bd29aa8136b351b62c8 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Fri, 6 Dec 2019 14:59:42 -0600 Subject: [PATCH] Fix cppcheck warnings for alinco --- alinco/alinco.c | 12 ++++++------ alinco/dx77.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alinco/alinco.c b/alinco/alinco.c index d6beea7bd..b6996183b 100644 --- a/alinco/alinco.c +++ b/alinco/alinco.c @@ -138,7 +138,8 @@ int alinco_transaction(RIG *rig, return retval; } - retval -= 2; + if (retval > 2) { retval -= 2; } + echobuf[retval] = 0; if (strcmp(echobuf, "OK") == 0) @@ -695,7 +696,7 @@ int alinco_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) funcbuf[2] = '\0'; settings = strtol(funcbuf, (char **)NULL, 16); - *status = settings & 0x08 ? 1 : 0; + *status = (settings & 0x08) ? 1 : 0; break; case RIG_FUNC_FAGC: @@ -708,7 +709,7 @@ int alinco_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) funcbuf[2] = '\0'; settings = strtol(funcbuf, (char **)NULL, 16); - *status = settings & 0x01 ? 1 : 0; + *status = (settings & 0x01) ? 1 : 0; break; case RIG_FUNC_NB: @@ -721,7 +722,7 @@ int alinco_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status) funcbuf[2] = '\0'; settings = strtol(funcbuf, (char **)NULL, 16); - *status = settings & 0x04 ? 1 : 0; + *status = (settings & 0x04) ? 1 : 0; break; default: @@ -1054,8 +1055,7 @@ int alinco_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) caps = rig->caps; - /* TODO: replace 200 by something like RIGTONEMAX */ - for (i = 0; caps->ctcss_list[i] != 0 && i < 200; i++) + for (i = 0; caps->ctcss_list[i] != 0; i++) { if (caps->ctcss_list[i] == tone) { diff --git a/alinco/dx77.c b/alinco/dx77.c index 67563608a..fb5223266 100644 --- a/alinco/dx77.c +++ b/alinco/dx77.c @@ -79,7 +79,7 @@ const struct rig_caps dx77_caps = .rig_model = RIG_MODEL_DX77, .model_name = "DX-77", .mfg_name = "Alinco", - .version = "0.7", + .version = "0.8", .copyright = "LGPL", .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_TRANSCEIVER,