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

Change sprintf to SNPRINTF in elad 

https://github.com/Hamlib/Hamlib/issues/857
pull/943/head
Mike Black W9MDB 2022-01-18 23:05:01 -06:00
rodzic 92542cb028
commit 53c8abd307
1 zmienionych plików z 65 dodań i 65 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

130
rigs/elad/elad.c
Wyświetl plik

@ -794,7 +794,7 @@ int elad_set_vfo(RIG *rig, vfo_t vfo)
{
char retbuf[20];
rig_debug(RIG_DEBUG_VERBOSE, "%s: Checking Satellite mode status\n", __func__);
snprintf(cmdbuf, sizeof(cmdbuf), "SA");
SNPRINTF(cmdbuf, sizeof(cmdbuf), "SA");
retval = elad_transaction(rig, cmdbuf, retbuf, 20);
@ -814,7 +814,7 @@ int elad_set_vfo(RIG *rig, vfo_t vfo)
}
}
snprintf(cmdbuf, sizeof(cmdbuf), "FR%c", vfo_function);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "FR%c", vfo_function);
if (rig->caps->rig_model == RIG_MODEL_TS50
|| rig->caps->rig_model == RIG_MODEL_TS940)
@ -873,7 +873,7 @@ int elad_set_vfo_main_sub(RIG *rig, vfo_t vfo)
return -RIG_EINVAL;
}
snprintf(cmdbuf, sizeof(cmdbuf), "CB%c", vfo_function);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "CB%c", vfo_function);
return elad_transaction(rig, cmdbuf, NULL, 0);
}
@ -921,7 +921,7 @@ int elad_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
if (retval != RIG_OK) { return retval; }
}
snprintf(cmdbuf, sizeof(cmdbuf), "TB%c", RIG_SPLIT_ON == split ? '1' : '0');
SNPRINTF(cmdbuf, sizeof(cmdbuf), "TB%c", RIG_SPLIT_ON == split ? '1' : '0');
return elad_transaction(rig, cmdbuf, NULL, 0);
}
@ -941,7 +941,7 @@ int elad_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
}
/* set RX VFO */
snprintf(cmdbuf, sizeof(cmdbuf), "FR%c", vfo_function);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "FR%c", vfo_function);
retval = elad_transaction(rig, cmdbuf, NULL, 0);
if (retval != RIG_OK)
@ -994,7 +994,7 @@ int elad_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
}
/* set TX VFO */
snprintf(cmdbuf, sizeof(cmdbuf), "FT%c", vfo_function);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "FT%c", vfo_function);
retval = elad_transaction(rig, cmdbuf, NULL, 0);
if (retval != RIG_OK)
@ -1021,7 +1021,7 @@ int elad_set_split(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
snprintf(cmdbuf, sizeof(cmdbuf), "SP%c", RIG_SPLIT_ON == split ? '1' : '0');
SNPRINTF(cmdbuf, sizeof(cmdbuf), "SP%c", RIG_SPLIT_ON == split ? '1' : '0');
retval = elad_transaction(rig, cmdbuf, NULL, 0);
@ -1232,7 +1232,7 @@ int elad_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
}
// cppcheck-suppress *
snprintf(freqbuf, sizeof(freqbuf), "F%c%011"PRIll, vfo_letter, (int64_t)freq);
SNPRINTF(freqbuf, sizeof(freqbuf), "F%c%011"PRIll, vfo_letter, (int64_t)freq);
err = elad_transaction(rig, freqbuf, NULL, 0);
@ -1363,7 +1363,7 @@ int elad_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
return -RIG_EINVAL;
}
snprintf(cmdbuf, sizeof(cmdbuf), "F%c", vfo_letter);
SNPRINTF(cmdbuf, sizeof(cmdbuf), "F%c", vfo_letter);
retval = elad_safe_transaction(rig, cmdbuf, freqbuf, 50, 13);
@ -1415,7 +1415,7 @@ int elad_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
return elad_transaction(rig, "RC", NULL, 0);
}
snprintf(buf, sizeof(buf), "R%c", (rit > 0) ? 'U' : 'D');
SNPRINTF(buf, sizeof(buf), "R%c", (rit > 0) ? 'U' : 'D');
retval = elad_transaction(rig, "RC", NULL, 0);
@ -1596,7 +1596,7 @@ int elad_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (err != RIG_OK) { return err; }
}
snprintf(buf, sizeof(buf), "OM0%c", c); /* target vfo is ignored */
SNPRINTF(buf, sizeof(buf), "OM0%c", c); /* target vfo is ignored */
err = elad_transaction(rig, buf, NULL, 0);
if (vfo != RIG_VFO_CURR && vfo != curr_vfo)
@ -1608,7 +1608,7 @@ int elad_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
}
else
{
snprintf(buf, sizeof(buf), "MD%c", '0' + kmode);
SNPRINTF(buf, sizeof(buf), "MD%c", '0' + kmode);
err = elad_transaction(rig, buf, NULL, 0);
}
@ -1624,7 +1624,7 @@ int elad_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
|| RIG_MODE_RTTYR == mode))
{
/* supports DATA sub modes - see above */
snprintf(buf, sizeof(buf), "DA%c", data_mode);
SNPRINTF(buf, sizeof(buf), "DA%c", data_mode);
err = elad_transaction(rig, buf, NULL, 0);
if (err != RIG_OK) { return err; }
@ -1762,12 +1762,12 @@ int elad_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "OM%c", c);
SNPRINTF(cmd, sizeof(cmd), "OM%c", c);
offs = 3;
}
else
{
snprintf(cmd, sizeof(cmd), "MD");
SNPRINTF(cmd, sizeof(cmd), "MD");
offs = 2;
}
@ -1894,20 +1894,20 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
*/
if (RIG_LEVEL_IS_FLOAT(level)) { elad_val = val.f * 100; }
snprintf(levelbuf, sizeof(levelbuf), "PC%03d", elad_val);
SNPRINTF(levelbuf, sizeof(levelbuf), "PC%03d", elad_val);
break;
case RIG_LEVEL_AF:
snprintf(levelbuf, sizeof(levelbuf), "AG%03d", elad_val);
SNPRINTF(levelbuf, sizeof(levelbuf), "AG%03d", elad_val);
break;
case RIG_LEVEL_RF:
/* XXX check level range */
snprintf(levelbuf, sizeof(levelbuf), "RG%03d", elad_val);
SNPRINTF(levelbuf, sizeof(levelbuf), "RG%03d", elad_val);
break;
case RIG_LEVEL_SQL:
snprintf(levelbuf, sizeof(levelbuf), "SQ%03d", elad_val);
SNPRINTF(levelbuf, sizeof(levelbuf), "SQ%03d", elad_val);
break;
case RIG_LEVEL_AGC:
@ -1916,7 +1916,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
elad_val = 3; /* 0.. 255 */
}
snprintf(levelbuf, sizeof(levelbuf), "GT%03d", 84 * elad_val);
SNPRINTF(levelbuf, sizeof(levelbuf), "GT%03d", 84 * elad_val);
break;
case RIG_LEVEL_ATT:
@ -1924,7 +1924,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/* set the attenuator if a correct value is entered */
if (val.i == 0)
{
snprintf(levelbuf, sizeof(levelbuf), "RA00");
SNPRINTF(levelbuf, sizeof(levelbuf), "RA00");
}
else
{
@ -1934,7 +1934,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
if (val.i == rig->state.attenuator[i])
{
snprintf(levelbuf, sizeof(levelbuf), "RA%02d", i + 1);
SNPRINTF(levelbuf, sizeof(levelbuf), "RA%02d", i + 1);
foundit = 1;
break;
}
@ -1953,7 +1953,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/* set the preamp if a correct value is entered */
if (val.i == 0)
{
snprintf(levelbuf, sizeof(levelbuf), "PA0");
SNPRINTF(levelbuf, sizeof(levelbuf), "PA0");
}
else
{
@ -1963,7 +1963,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
{
if (val.i == rig->state.preamp[i])
{
snprintf(levelbuf, sizeof(levelbuf), "PA%01d", i + 1);
SNPRINTF(levelbuf, sizeof(levelbuf), "PA%01d", i + 1);
foundit = 1;
break;
}
@ -1983,7 +1983,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
snprintf(levelbuf, sizeof(levelbuf), "SH%02d", (val.i));
SNPRINTF(levelbuf, sizeof(levelbuf), "SH%02d", (val.i));
break;
case RIG_LEVEL_SLOPE_LOW:
@ -1992,7 +1992,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
snprintf(levelbuf, sizeof(levelbuf), "SL%02d", (val.i));
SNPRINTF(levelbuf, sizeof(levelbuf), "SL%02d", (val.i));
break;
case RIG_LEVEL_CWPITCH:
@ -2001,7 +2001,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
snprintf(levelbuf, sizeof(levelbuf), "PT%02d", (val.i / 50) - 8);
SNPRINTF(levelbuf, sizeof(levelbuf), "PT%02d", (val.i / 50) - 8);
break;
case RIG_LEVEL_KEYSPD:
@ -2010,7 +2010,7 @@ int elad_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return -RIG_EINVAL;
}
snprintf(levelbuf, sizeof(levelbuf), "KS%03d", val.i);
SNPRINTF(levelbuf, sizeof(levelbuf), "KS%03d", val.i);
break;
default:
@ -2313,59 +2313,59 @@ int elad_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
switch (func)
{
case RIG_FUNC_NB:
snprintf(buf, sizeof(buf), "NB%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "NB%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_ABM:
snprintf(buf, sizeof(buf), "AM%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "AM%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_COMP:
snprintf(buf, sizeof(buf), "PR%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "PR%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_TONE:
snprintf(buf, sizeof(buf), "TO%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "TO%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_TSQL:
snprintf(buf, sizeof(buf), "CT%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "CT%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_VOX:
snprintf(buf, sizeof(buf), "VX%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "VX%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_FAGC:
snprintf(buf, sizeof(buf), "GT00%c", (status == 0) ? '4' : '2');
SNPRINTF(buf, sizeof(buf), "GT00%c", (status == 0) ? '4' : '2');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_NR:
snprintf(buf, sizeof(buf), "NR%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "NR%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_BC:
snprintf(buf, sizeof(buf), "BC%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "BC%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_ANF:
snprintf(buf, sizeof(buf), "NT%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "NT%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_LOCK:
snprintf(buf, sizeof(buf), "LK%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "LK%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_AIP:
snprintf(buf, sizeof(buf), "MX%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "MX%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_RIT:
snprintf(buf, sizeof(buf), "RT%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "RT%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case RIG_FUNC_XIT:
snprintf(buf, sizeof(buf), "XT%c", (status == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "XT%c", (status == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
default:
@ -2506,7 +2506,7 @@ int elad_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
}
/* TODO: replace menu no 57 by a define */
snprintf(tonebuf, sizeof(tonebuf), "EX%03d%04d", 57, i + 1);
SNPRINTF(tonebuf, sizeof(tonebuf), "EX%03d%04d", 57, i + 1);
return elad_transaction(rig, tonebuf, NULL, 0);
}
@ -2558,11 +2558,11 @@ int elad_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
return -RIG_EINVAL;
}
snprintf(buf, sizeof(buf), "TN%c%02d", c, i + 1);
SNPRINTF(buf, sizeof(buf), "TN%c%02d", c, i + 1);
}
else
{
snprintf(buf, sizeof(buf), "TN%02d", i + 1);
SNPRINTF(buf, sizeof(buf), "TN%02d", i + 1);
}
return elad_transaction(rig, buf, NULL, 0);
@ -2609,7 +2609,7 @@ int elad_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "TN%c", c);
SNPRINTF(cmd, sizeof(cmd), "TN%c", c);
retval = elad_safe_transaction(rig, cmd, buf, sizeof(buf), 5);
memcpy(tonebuf, &buf[3], 2);
}
@ -2696,11 +2696,11 @@ int elad_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
return -RIG_EINVAL;
}
snprintf(buf, sizeof(buf), "CN%c%02d", c, i + 1);
SNPRINTF(buf, sizeof(buf), "CN%c%02d", c, i + 1);
}
else
{
snprintf(buf, sizeof(buf), "CN%02d", i + 1);
SNPRINTF(buf, sizeof(buf), "CN%02d", i + 1);
}
return elad_transaction(rig, buf, NULL, 0);
@ -2742,12 +2742,12 @@ int elad_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "CN%c", c);
SNPRINTF(cmd, sizeof(cmd), "CN%c", c);
offs = 3;
}
else
{
snprintf(cmd, sizeof(cmd), "CT");
SNPRINTF(cmd, sizeof(cmd), "CT");
offs = 2;
}
@ -2833,11 +2833,11 @@ int elad_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "AN0%c%c99", c, a);
SNPRINTF(cmd, sizeof(cmd), "AN0%c%c99", c, a);
}
else
{
snprintf(cmd, sizeof(cmd), "AN%c", a);
SNPRINTF(cmd, sizeof(cmd), "AN%c", a);
}
return elad_transaction(rig, cmd, NULL, 0);
@ -3147,7 +3147,7 @@ int elad_reset(RIG *rig, reset_t reset)
}
}
snprintf(rstbuf, sizeof(rstbuf), "SR%c", rst);
SNPRINTF(rstbuf, sizeof(rstbuf), "SR%c", rst);
/* this command has no answer */
return elad_transaction(rig, rstbuf, NULL, 0);
@ -3209,12 +3209,12 @@ int elad_send_morse(RIG *rig, vfo_t vfo, const char *msg)
switch (rig->caps->rig_model)
{
case RIG_MODEL_K3: // probably a lot more rigs need to go here
snprintf(morsebuf, sizeof(morsebuf), "KY %s", m2);
SNPRINTF(morsebuf, sizeof(morsebuf), "KY %s", m2);
break;
default:
/* the command must consist of 28 bytes 0x20 padded */
snprintf(morsebuf, sizeof(morsebuf), "KY %-24s", m2);
SNPRINTF(morsebuf, sizeof(morsebuf), "KY %-24s", m2);
for (i = strlen(morsebuf) - 1; i > 0 && morsebuf[i] == ' '; --i)
{
@ -3298,7 +3298,7 @@ int elad_set_mem(RIG *rig, vfo_t vfo, int ch)
return -RIG_EINVAL;
}
snprintf(buf, sizeof(buf), "MN%c%03d", c, ch);
SNPRINTF(buf, sizeof(buf), "MN%c%03d", c, ch);
}
else
{
@ -3307,7 +3307,7 @@ int elad_set_mem(RIG *rig, vfo_t vfo, int ch)
* where b is the bank number, mm the memory number.
* b can be a space
*/
snprintf(buf, sizeof(buf), "MC %02d", ch);
SNPRINTF(buf, sizeof(buf), "MC %02d", ch);
}
return elad_transaction(rig, buf, NULL, 0);
@ -3348,7 +3348,7 @@ int elad_get_mem(RIG *rig, vfo_t vfo, int *ch)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "MN%c", c);
SNPRINTF(cmd, sizeof(cmd), "MN%c", c);
offs = 3;
}
else
@ -3358,7 +3358,7 @@ int elad_get_mem(RIG *rig, vfo_t vfo, int *ch)
* where b is the bank number, mm the memory number.
* b can be a space
*/
snprintf(cmd, sizeof(cmd), "MC");
SNPRINTF(cmd, sizeof(cmd), "MC");
offs = 2;
}
@ -3414,7 +3414,7 @@ int elad_get_channel(RIG *rig, channel_t *chan)
bank = '0' + chan->bank_num;
}
snprintf(cmd, sizeof(cmd), "MR0%c%02d", bank, chan->channel_num);
SNPRINTF(cmd, sizeof(cmd), "MR0%c%02d", bank, chan->channel_num);
err = elad_safe_transaction(rig, cmd, buf, 26, 23);
@ -3565,7 +3565,7 @@ int elad_set_channel(RIG *rig, const channel_t *chan)
bank = '0' + chan->bank_num;
}
snprintf(buf, sizeof(buf),
SNPRINTF(buf, sizeof(buf),
"MW0%c%02d%011"PRIll"%c%c%c%02d ", /* note the space at
the end */
bank,
@ -3583,7 +3583,7 @@ int elad_set_channel(RIG *rig, const channel_t *chan)
return err;
}
snprintf(buf, sizeof(buf), "MW1%c%02d%011"PRIll"%c%c%c%02d ",
SNPRINTF(buf, sizeof(buf), "MW1%c%02d%011"PRIll"%c%c%c%02d ",
bank,
chan->channel_num,
(int64_t)(chan->split == RIG_SPLIT_ON ? chan->tx_freq : 0),
@ -3607,15 +3607,15 @@ int elad_set_ext_parm(RIG *rig, token_t token, value_t val)
return elad_transaction(rig, "VR", NULL, 0);
case TOK_FINE:
snprintf(buf, sizeof(buf), "FS%c", (val.i == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "FS%c", (val.i == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case TOK_XIT:
snprintf(buf, sizeof(buf), "XT%c", (val.i == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "XT%c", (val.i == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
case TOK_RIT:
snprintf(buf, sizeof(buf), "RT%c", (val.i == 0) ? '0' : '1');
SNPRINTF(buf, sizeof(buf), "RT%c", (val.i == 0) ? '0' : '1');
return elad_transaction(rig, buf, NULL, 0);
}