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

Avoid referencing NULL priv_caps

pull/426/head
Mikael Nousiainen 2020-10-26 10:44:01 +02:00
rodzic b460c24d5a
commit 3af4de5781
1 zmienionych plików z 6 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
rigs/yaesu/newcat.c
Wyświetl plik

@ -6301,7 +6301,7 @@ static int set_roofing_filter(RIG *rig, vfo_t vfo, int index)
{
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
struct newcat_priv_caps *priv_caps = (struct newcat_priv_caps *)rig->caps->priv;
struct newcat_roofing_filter *roofing_filters = priv_caps->roofing_filters;
struct newcat_roofing_filter *roofing_filters;
char main_sub_vfo = '0';
char roofing_filter_choice = 0;
int err;
@ -6314,6 +6314,8 @@ static int set_roofing_filter(RIG *rig, vfo_t vfo, int index)
return -RIG_ENAVAIL;
}
roofing_filters = priv_caps->roofing_filters;
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
{
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
@ -6405,7 +6407,7 @@ static int get_roofing_filter(RIG *rig, vfo_t vfo, struct newcat_roofing_filter
{
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
struct newcat_priv_caps *priv_caps = (struct newcat_priv_caps *)rig->caps->priv;
struct newcat_roofing_filter *roofing_filters = priv_caps->roofing_filters;
struct newcat_roofing_filter *roofing_filters;
char roofing_filter_choice;
char main_sub_vfo = '0';
char rf_vfo = 'X';
@ -6420,6 +6422,8 @@ static int get_roofing_filter(RIG *rig, vfo_t vfo, struct newcat_roofing_filter
return -RIG_ENAVAIL;
}
roofing_filters = priv_caps->roofing_filters;
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE)
{
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';