From 2362d2fe1cd332dee85158e00102568987fc44cb Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sat, 19 Sep 2020 14:33:27 -0500 Subject: [PATCH] Clean up cppcheck scope --- rigs/kenwood/flex6xxx.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c index b031f8603..63a42451c 100644 --- a/rigs/kenwood/flex6xxx.c +++ b/rigs/kenwood/flex6xxx.c @@ -806,6 +806,14 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) case RIG_LEVEL_MICGAIN: n = sscanf(lvlbuf + len, "%f", &val->f); + + if (n != 1) + { + rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n", + __func__, lvlbuf); + return -RIG_EPROTO; + } + // Thetis returns -40 to 10 -- does PowerSDR do the same? // Setting val->f = (val->f - -40) / (10 - -40); @@ -814,12 +822,28 @@ int powersdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) case RIG_LEVEL_VOXGAIN: // return is 0-1000 n = sscanf(lvlbuf + len, "%f", &val->f); + + if (n != 1) + { + rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n", + __func__, lvlbuf); + return -RIG_EPROTO; + } + val->f /= 1000; break; case RIG_LEVEL_SQL: n = sscanf(lvlbuf + len, "%f", &val->f); + if (n != 1) + { + rig_debug(RIG_DEBUG_ERR, "%s: Error parsing value from lvlbuf='%s'\n", + __func__, lvlbuf); + return -RIG_EPROTO; + } + + powersdr_get_mode(rig, vfo, &mode, &width); if (mode == RIG_MODE_FM)