mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix cppcheck warnings in rx331.c

pull/155/head
Michael Black 2019-12-08 23:03:50 -06:00
rodzic 4f55f69d23
commit 1b981c9a64
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
1 zmienionych plików z 9 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
tentec/rx331.c
Wyświetl plik

@ -275,7 +275,9 @@ static int rx331_transaction(RIG *rig, const char *cmd, int cmd_len, char *data,
return retval; return retval;
} }
sscanf(data + 1, "%i%s", &rig_id, data); char fmt[16];
snprintf(fmt,sizeof(fmt)-1,"%%i%%%ds",BUFSZ);
sscanf(data + 1, fmt, &rig_id, data);
if (rig_id != priv->receiver_id) if (rig_id != priv->receiver_id)
{ {
@ -353,7 +355,7 @@ int rx331_get_conf(RIG *rig, token_t token, char *val)
switch (token) switch (token)
{ {
case TOK_RIGID: case TOK_RIGID:
sprintf(val, "%d", priv->receiver_id); sprintf(val, "%u", priv->receiver_id);
break; break;
default: default:
@ -569,13 +571,13 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
switch (level) switch (level)
{ {
case RIG_LEVEL_ATT: case RIG_LEVEL_ATT:
cmd_len = sprintf(cmdbuf, "$%iK%i" EOM, cmd_len = sprintf(cmdbuf, "$%uK%i" EOM,
priv->receiver_id, priv->receiver_id,
val.i ? RX331_ATT_ON : RX331_ATT_OFF); val.i ? RX331_ATT_ON : RX331_ATT_OFF);
break; break;
case RIG_LEVEL_PREAMP: case RIG_LEVEL_PREAMP:
cmd_len = sprintf(cmdbuf, "$%iK%i" EOM, cmd_len = sprintf(cmdbuf, "$%uK%i" EOM,
priv->receiver_id, priv->receiver_id,
val.i ? RX331_PREAMP_ON : RX331_PREAMP_OFF); val.i ? RX331_PREAMP_ON : RX331_PREAMP_OFF);
break; break;
@ -598,17 +600,17 @@ int rx331_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
cmd_len = sprintf(cmdbuf, "$%iM%i" EOM, cmd_len = sprintf(cmdbuf, "$%uM%i" EOM,
priv->receiver_id, val.i); priv->receiver_id, val.i);
break; break;
case RIG_LEVEL_RF: case RIG_LEVEL_RF:
cmd_len = sprintf(cmdbuf, "$%iA%d" EOM, priv->receiver_id, cmd_len = sprintf(cmdbuf, "$%uA%d" EOM, priv->receiver_id,
120 - (int)(val.f * 120)); 120 - (int)(val.f * 120));
break; break;
case RIG_LEVEL_SQL: case RIG_LEVEL_SQL:
cmd_len = sprintf(cmdbuf, "$%iQ%d" EOM, priv->receiver_id, cmd_len = sprintf(cmdbuf, "$%uQ%d" EOM, priv->receiver_id,
120 - (int)(val.f * 120)); 120 - (int)(val.f * 120));
break; break;