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

Fix cppcheck warnings in rig.c

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

19
src/rig.c
Wyświetl plik

@ -1093,7 +1093,7 @@ int HAMLIB_API rig_cleanup(RIG *rig)
int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq) int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
const struct rig_caps *caps; const struct rig_caps *caps;
int retcode, rc2; int retcode;
vfo_t curr_vfo; vfo_t curr_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -1143,7 +1143,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
retcode = caps->set_freq(rig, vfo, freq); retcode = caps->set_freq(rig, vfo, freq);
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
rc2 = caps->set_vfo(rig, curr_vfo); int rc2 = caps->set_vfo(rig, curr_vfo);
if (RIG_OK == retcode) if (RIG_OK == retcode)
{ {
@ -1182,7 +1182,7 @@ int HAMLIB_API rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
const struct rig_caps *caps; const struct rig_caps *caps;
int retcode, rc2; int retcode;
vfo_t curr_vfo; vfo_t curr_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -1221,7 +1221,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
retcode = caps->get_freq(rig, vfo, freq); retcode = caps->get_freq(rig, vfo, freq);
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
rc2 = caps->set_vfo(rig, curr_vfo); int rc2 = caps->set_vfo(rig, curr_vfo);
if (RIG_OK == retcode) if (RIG_OK == retcode)
{ {
@ -1273,7 +1273,7 @@ int HAMLIB_API rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
const struct rig_caps *caps; const struct rig_caps *caps;
int retcode, rc2; int retcode;
vfo_t curr_vfo; vfo_t curr_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -1314,7 +1314,7 @@ int HAMLIB_API rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
retcode = caps->set_mode(rig, vfo, mode, width); retcode = caps->set_mode(rig, vfo, mode, width);
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
rc2 = caps->set_vfo(rig, curr_vfo); int rc2 = caps->set_vfo(rig, curr_vfo);
/* return the first error code */ /* return the first error code */
if (RIG_OK == retcode) if (RIG_OK == retcode)
@ -1359,7 +1359,7 @@ int HAMLIB_API rig_get_mode(RIG *rig,
pbwidth_t *width) pbwidth_t *width)
{ {
const struct rig_caps *caps; const struct rig_caps *caps;
int retcode, rc2; int retcode;
vfo_t curr_vfo; vfo_t curr_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -1400,7 +1400,7 @@ int HAMLIB_API rig_get_mode(RIG *rig,
retcode = caps->get_mode(rig, vfo, mode, width); retcode = caps->get_mode(rig, vfo, mode, width);
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
rc2 = caps->set_vfo(rig, curr_vfo); int rc2 = caps->set_vfo(rig, curr_vfo);
if (RIG_OK == retcode) if (RIG_OK == retcode)
{ {
@ -1676,7 +1676,6 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
const struct rig_caps *caps; const struct rig_caps *caps;
struct rig_state *rs = &rig->state; struct rig_state *rs = &rig->state;
int retcode = RIG_OK; int retcode = RIG_OK;
int rc2;
vfo_t curr_vfo; vfo_t curr_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -1724,7 +1723,7 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
{ {
retcode = caps->set_ptt(rig, vfo, ptt); retcode = caps->set_ptt(rig, vfo, ptt);
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
rc2 = caps->set_vfo(rig, curr_vfo); int rc2 = caps->set_vfo(rig, curr_vfo);
/* return the first error code */ /* return the first error code */
if (RIG_OK == retcode) if (RIG_OK == retcode)