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

Fix cppcheck warnings in flrig.c

pull/155/head
Michael Black 2019-12-18 22:33:06 -06:00
rodzic 530a1dca16
commit 7d0805628a
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
1 zmienionych plików z 16 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
dummy/flrig.c
Wyświetl plik

@ -351,6 +351,7 @@ static char *xml_parse(char *xml, char *value, int value_len)
{ {
char *next; char *next;
char *pxml; char *pxml;
/* first off we should have an OK on the 1st line */ /* first off we should have an OK on the 1st line */
if (strstr(xml, " 200 OK") == NULL) if (strstr(xml, " 200 OK") == NULL)
{ {
@ -497,7 +498,8 @@ static int write_transaction(RIG *rig, char *xml, int xml_len)
*/ */
static int flrig_init(RIG *rig) static int flrig_init(RIG *rig)
{ {
struct flrig_priv_data *priv = (struct flrig_priv_data *)malloc(sizeof(struct flrig_priv_data)); struct flrig_priv_data *priv = (struct flrig_priv_data *)malloc(sizeof(
struct flrig_priv_data));
rig_debug(RIG_DEBUG_TRACE, "%s version %s\n", __func__, BACKEND_VER); rig_debug(RIG_DEBUG_TRACE, "%s version %s\n", __func__, BACKEND_VER);
@ -669,6 +671,9 @@ static int flrig_open(RIG *rig)
/* see if get_modeA is available */ /* see if get_modeA is available */
pxml = xml_build("rig.get_modeA", NULL, xml, sizeof(xml)); pxml = xml_build("rig.get_modeA", NULL, xml, sizeof(xml));
retval = write_transaction(rig, pxml, strlen(pxml)); retval = write_transaction(rig, pxml, strlen(pxml));
if (retval != RIG_OK) { return retval; }
read_transaction(rig, xml, sizeof(xml)); read_transaction(rig, xml, sizeof(xml));
xml_parse(xml, value, sizeof(value)); xml_parse(xml, value, sizeof(value));
@ -841,11 +846,14 @@ static int flrig_open(RIG *rig)
} }
rig->state.mode_list = modes; rig->state.mode_list = modes;
retval = rig_strrmodes(modes, value, sizeof(value)); retval = rig_strrmodes(modes, value, sizeof(value));
if (retval != RIG_OK) { // we might get TRUNC but we can still print the debug
rig_debug(RIG_DEBUG_VERBOSE, "%s: %s\n", __func__, rigerror(retval)); if (retval != RIG_OK) // we might get TRUNC but we can still print the debug
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: %s\n", __func__, rigerror(retval));
} }
rig_debug(RIG_DEBUG_VERBOSE, "%s: hamlib modes=%s\n", __func__, value); rig_debug(RIG_DEBUG_VERBOSE, "%s: hamlib modes=%s\n", __func__, value);
return retval; return retval;
@ -1257,9 +1265,10 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
cmd = "rig.set_modeB"; cmd = "rig.set_modeB";
} }
else else
{ // we make VFO_B mode unknown so it expires the cache {
priv->curr_modeB = RIG_MODE_NONE; // we make VFO_B mode unknown so it expires the cache
priv->curr_modeB = RIG_MODE_NONE;
} }
pxml = xml_build(cmd, cmd_buf, xml, sizeof(xml)); pxml = xml_build(cmd, cmd_buf, xml, sizeof(xml));