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

Fix cppcheck shadow variable

pull/1354/head
Mike Black W9MDB 2023-08-02 23:32:02 -05:00
rodzic 364a136000
commit 17c5a8aed9
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
rigs/icom/frame.c
Wyświetl plik

@ -399,15 +399,15 @@ read_another_frame:
// TODO: Does ctrlid (detected by icom_is_async_frame) vary (seeing some code above using 0x80 for non-full-duplex)? // TODO: Does ctrlid (detected by icom_is_async_frame) vary (seeing some code above using 0x80 for non-full-duplex)?
if (icom_is_async_frame(rig, frm_len, buf)) if (icom_is_async_frame(rig, frm_len, buf))
{ {
int elapsed_ms; int elapsedms;
icom_process_async_frame(rig, frm_len, buf); icom_process_async_frame(rig, frm_len, buf);
gettimeofday(&current_time, NULL); gettimeofday(&current_time, NULL);
timersub(&current_time, &start_time, &elapsed_time); timersub(&current_time, &start_time, &elapsed_time);
elapsed_ms = (int)(elapsed_time.tv_sec * 1000 + elapsed_time.tv_usec / 1000); elapsedms = (int)(elapsed_time.tv_sec * 1000 + elapsed_time.tv_usec / 1000);
if (elapsed_ms > rs->rigport.timeout) if (elapsedms > rs->rigport.timeout)
{ {
set_transaction_inactive(rig); set_transaction_inactive(rig);
RETURNFUNC(-RIG_ETIMEOUT); RETURNFUNC(-RIG_ETIMEOUT);
@ -584,7 +584,7 @@ int rig2icom_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width,
unsigned char icmode; unsigned char icmode;
signed char icmode_ext; signed char icmode_ext;
pbwidth_t width_tmp = width; pbwidth_t width_tmp = width;
struct icom_priv_data *priv_data = (struct icom_priv_data *) rig->state.priv; const struct icom_priv_data *priv_data = (struct icom_priv_data *) rig->state.priv;
ENTERFUNC; ENTERFUNC;
rig_debug(RIG_DEBUG_TRACE, "%s: mode=%d, width=%d\n", __func__, (int)mode, rig_debug(RIG_DEBUG_TRACE, "%s: mode=%d, width=%d\n", __func__, (int)mode,