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

Change snprintf to SNPRINTF in rigs 

https://github.com/Hamlib/Hamlib/issues/857
pull/948/head
Mike Black W9MDB 2022-01-22 22:37:09 -06:00
rodzic fba46c7850
commit 38d7697d03
4 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

6
rigs/barrett/barrett.c
Wyświetl plik

@ -63,7 +63,7 @@ DECLARE_INITRIG_BACKEND(barrett)
int barrett_transaction(RIG *rig, char *cmd, int expected, char **result) int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
{ {
char cmd_buf[MAXCMDLEN]; char cmd_buf[MAXCMDLEN];
int retval, cmd_len; int retval;
char *p; char *p;
char xon; char xon;
char xoff; char xoff;
@ -72,10 +72,10 @@ int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd); rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd);
cmd_len = snprintf(cmd_buf, sizeof(cmd_buf), "%s%s", cmd, EOM); SNPRINTF(cmd_buf, sizeof(cmd_buf), "%s%s", cmd, EOM);
rig_flush(&rs->rigport); rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (unsigned char *) cmd_buf, cmd_len); retval = write_block(&rs->rigport, (unsigned char *) cmd_buf, strlen(cmd_buf));
if (retval < 0) if (retval < 0)
{ {

6
rigs/codan/codan.c
Wyświetl plik

@ -52,17 +52,17 @@ int codan_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
int codan_transaction(RIG *rig, char *cmd, int expected, char **result) int codan_transaction(RIG *rig, char *cmd, int expected, char **result)
{ {
char cmd_buf[MAXCMDLEN]; char cmd_buf[MAXCMDLEN];
int retval, cmd_len; int retval;
struct rig_state *rs = &rig->state; struct rig_state *rs = &rig->state;
struct codan_priv_data *priv = rig->state.priv; struct codan_priv_data *priv = rig->state.priv;
//int retry = 3; //int retry = 3;
rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd); rig_debug(RIG_DEBUG_VERBOSE, "%s: cmd=%s\n", __func__, cmd);
cmd_len = snprintf(cmd_buf, sizeof(cmd_buf), "%s%s", cmd, EOM); SNPRINTF(cmd_buf, sizeof(cmd_buf), "%s%s", cmd, EOM);
rig_flush(&rs->rigport); rig_flush(&rs->rigport);
retval = write_block(&rs->rigport, (unsigned char *) cmd_buf, cmd_len); retval = write_block(&rs->rigport, (unsigned char *) cmd_buf, strlen(cmd_buf));
hl_usleep(rig->caps->post_write_delay); hl_usleep(rig->caps->post_write_delay);
if (retval < 0) if (retval < 0)

2
rigs/icom/icr75.c
Wyświetl plik

@ -296,7 +296,7 @@ int icr75_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan)
to_bcd_be(chanbuf + chan_len++, chan->ant, 2); to_bcd_be(chanbuf + chan_len++, chan->ant, 2);
memset(chanbuf + chan_len, 0, 8); memset(chanbuf + chan_len, 0, 8);
snprintf((char *)(chanbuf + chan_len), 9, "%.8s", chan->channel_desc); SNPRINTF((char *)(chanbuf + chan_len), 9, "%.8s", chan->channel_desc);
chan_len += 8; chan_len += 8;
retval = icom_transaction(rig, C_CTL_MEM, S_MEM_CNTNT, retval = icom_transaction(rig, C_CTL_MEM, S_MEM_CNTNT,

5
rigs/tentec/paragon.c
Wyświetl plik

@ -365,9 +365,8 @@ int tt585_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
struct tt585_priv_data *priv = (struct tt585_priv_data *)rig->state.priv; struct tt585_priv_data *priv = (struct tt585_priv_data *)rig->state.priv;
#define FREQBUFSZ 16 #define FREQBUFSZ 16
char buf[FREQBUFSZ], *p; char buf[FREQBUFSZ], *p;
int ret;
ret = num_snprintf(buf, FREQBUFSZ - 1, "%.5f@", (double)freq / MHz(1)); num_snprintf(buf, FREQBUFSZ - 1, "%.5f@", (double)freq / MHz(1));
buf[FREQBUFSZ - 1] = '\0'; buf[FREQBUFSZ - 1] = '\0';
/* replace decimal point with W */ /* replace decimal point with W */
@ -376,7 +375,7 @@ int tt585_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
rig_force_cache_timeout(&priv->status_tv); rig_force_cache_timeout(&priv->status_tv);
return write_block(&rig->state.rigport, (unsigned char *) buf, ret); return write_block(&rig->state.rigport, (unsigned char *) buf, strlen(buf));
} }
/* /*