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

Fix cppcheck warnings in winradio

pull/174/head
Michael Black 2020-01-13 12:16:31 -06:00
rodzic 49ce282c2f
commit 47376d9004
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6599353EC683404D
3 zmienionych plików z 12 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
winradio/g303.c
Wyświetl plik

@ -190,14 +190,16 @@ int g3_init(RIG *rig)
{ {
struct g3_priv_data *priv; struct g3_priv_data *priv;
priv = (struct g3_priv_data *)malloc(sizeof(struct g3_priv_data)); rig->state.priv = (struct g3_priv_data *)malloc(sizeof(struct g3_priv_data));
if (!priv) if (!rig->state.priv)
{ {
/* whoops! memory shortage! */ /* whoops! memory shortage! */
return -RIG_ENOMEM; return -RIG_ENOMEM;
} }
priv = rig->state.priv;
/* Try to load required dll */ /* Try to load required dll */
priv->dll = LoadLibrary(WRG3DLL); priv->dll = LoadLibrary(WRG3DLL);
@ -232,8 +234,6 @@ int g3_init(RIG *rig)
(FNCGetRawSignalStrength) GetProcAddress(priv->dll, "GetRawSignalStrength"); (FNCGetRawSignalStrength) GetProcAddress(priv->dll, "GetRawSignalStrength");
priv->G3GetInfo = (FNCG3GetInfo) GetProcAddress(priv->dll, "G3GetInfo"); priv->G3GetInfo = (FNCG3GetInfo) GetProcAddress(priv->dll, "G3GetInfo");
rig->state.priv = (void *)priv;
return RIG_OK; return RIG_OK;
} }

8
winradio/g305.c
Wyświetl plik

@ -191,14 +191,16 @@ int g3_init(RIG *rig)
{ {
struct g3_priv_data *priv; struct g3_priv_data *priv;
priv = (struct g3_priv_data *)malloc(sizeof(struct g3_priv_data)); rig->state.priv = (struct g3_priv_data *)malloc(sizeof(struct g3_priv_data));
if (!priv) if (!rig->state.priv)
{ {
/* whoops! memory shortage! */ /* whoops! memory shortage! */
return -RIG_ENOMEM; return -RIG_ENOMEM;
} }
priv = rig->state.priv;
/* Try to load required dll */ /* Try to load required dll */
priv->dll = LoadLibrary(WRG3DLL); priv->dll = LoadLibrary(WRG3DLL);
@ -233,8 +235,6 @@ int g3_init(RIG *rig)
(FNCGetRawSignalStrength) GetProcAddress(priv->dll, "GetRawSignalStrength"); (FNCGetRawSignalStrength) GetProcAddress(priv->dll, "GetRawSignalStrength");
priv->G3GetInfo = (FNCG3GetInfo) GetProcAddress(priv->dll, "G3GetInfo"); priv->G3GetInfo = (FNCG3GetInfo) GetProcAddress(priv->dll, "G3GetInfo");
rig->state.priv = (void *)priv;
return RIG_OK; return RIG_OK;
} }

8
winradio/g313-win.c
Wyświetl plik

@ -233,14 +233,16 @@ int g313_init(RIG *rig)
{ {
struct g313_priv_data *priv; struct g313_priv_data *priv;
priv = (struct g313_priv_data *)malloc(sizeof(struct g313_priv_data)); rig->state.priv = (struct g313_priv_data *)malloc(sizeof(struct g313_priv_data));
if (!priv) if (!rig->state.priv)
{ {
/* whoops! memory shortage! */ /* whoops! memory shortage! */
return -RIG_ENOMEM; return -RIG_ENOMEM;
} }
priv = rig->state.priv;
priv->WaveOutDeviceID = -1; priv->WaveOutDeviceID = -1;
priv->Opened = 0; priv->Opened = 0;
@ -341,8 +343,6 @@ int g313_init(RIG *rig)
"waveOutGetNumDevs"); "waveOutGetNumDevs");
rig->state.priv = (void *)priv;
return RIG_OK; return RIG_OK;
} }