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

Fix gcc 10 compiler warning and cleanup code a bit in aor.c

pull/224/head
Michael Black 2020-04-04 23:32:56 -05:00
rodzic 46cb356f11
commit c6189dcfa7
2 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
rigs/aor/aor.c
Wyświetl plik

@ -439,17 +439,17 @@ int format8k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
{ {
struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv; struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
char mdbuf[BUFSZ]; char mdbuf[8];
char mdbuf2[BUFSZ] = ""; char mdbuf2[16] = "";
int mdbuf_len, mdbuf2_len, retval; int mdbuf2_len, retval;
mdbuf_len = priv->format_mode(rig, mdbuf, mode, width); if (priv->format_mode(rig, mdbuf, mode, width) <= 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: format_mode=%s failed?\n", __func__, rig_strrmode(mode));
return -RIG_EINVAL;
}
// Return on error strcat(mdbuf, EOM);
if (mdbuf_len < 0) { return mdbuf_len; }
strcpy(mdbuf + mdbuf_len, EOM);
mdbuf_len += strlen(EOM);
switch (rig->caps->rig_model) switch (rig->caps->rig_model)
{ {
@ -475,7 +475,7 @@ int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
break; break;
default: default:
retval = aor_transaction(rig, mdbuf, mdbuf_len, NULL, NULL); retval = aor_transaction(rig, mdbuf, strlen(mdbuf), NULL, NULL);
} }
return retval; return retval;

2
rigs/aor/aor.h
Wyświetl plik

@ -24,7 +24,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#define BACKEND_VER "20200323" #define BACKEND_VER "20200404"
int format8k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width); int format8k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width);