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

Change sprintf to snprint in dummy directory 

https://github.com/Hamlib/Hamlib/issues/857
pull/928/head
Mike Black W9MDB 2022-01-11 12:17:34 -06:00
rodzic 3232117ebf
commit 8829a8011d
7 zmienionych plików z 259 dodań i 259 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1123,11 +1123,11 @@ static int dummy_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
if (RIG_LEVEL_IS_FLOAT(level))
{
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
}
else
{
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s %s\n", __func__,
@ -1296,15 +1296,15 @@ static int dummy_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
break;
case RIG_CONF_COMBO:
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
break;
case RIG_CONF_NUMERIC:
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
break;
case RIG_CONF_CHECKBUTTON:
sprintf(lstr, "%s", val.i ? "ON" : "OFF");
SNPRINTF(lstr, sizeof(lstr), "%s", val.i ? "ON" : "OFF");
break;
case RIG_CONF_BUTTON:
@ -1505,11 +1505,11 @@ static int dummy_set_parm(RIG *rig, setting_t parm, value_t val)
if (RIG_PARM_IS_FLOAT(parm))
{
sprintf(pstr, "%f", val.f);
SNPRINTF(pstr, sizeof(pstr), "%f", val.f);
}
else
{
sprintf(pstr, "%d", val.i);
SNPRINTF(pstr, sizeof(pstr), "%d", val.i);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s %s\n", __func__,
@ -1571,15 +1571,15 @@ static int dummy_set_ext_parm(RIG *rig, token_t token, value_t val)
break;
case RIG_CONF_COMBO:
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
break;
case RIG_CONF_NUMERIC:
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
break;
case RIG_CONF_CHECKBUTTON:
sprintf(lstr, "%s", val.i ? "ON" : "OFF");
SNPRINTF(lstr, sizeof(lstr), "%s", val.i ? "ON" : "OFF");
break;
case RIG_CONF_BUTTON:

28
rigs/dummy/flrig.c
Wyświetl plik

@ -1198,7 +1198,7 @@ static int flrig_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
vfo = RIG_VFO_B; // if split always TX on VFOB
}
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><double>%.0f</double></value></param></params>", freq);
value_t val;
@ -1255,7 +1255,7 @@ static int flrig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
RETURNFUNC(-RIG_EINVAL);
}
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><i4>%d</i4></value></param></params>",
ptt);
@ -1457,7 +1457,7 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (p) { *p = 0; } // remove any other pipe
sprintf(cmd_arg, "<params><param><value>%s</value></param></params>", pttmode);
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value>%s</value></param></params>", pttmode);
free(ttmode);
if (!priv->has_get_modeA)
@ -1513,7 +1513,7 @@ static int flrig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
// Need to update the bandwidth
if (width > 0 && needBW)
{
sprintf(cmd_arg, "<params><param><value><i4>%ld</i4></value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value><i4>%ld</i4></value></param></params>",
width);
retval = flrig_transaction(rig, "rig.set_bandwidth", cmd_arg, NULL, 0);
@ -1750,7 +1750,7 @@ static int flrig_set_vfo(RIG *rig, vfo_t vfo)
vfo = rig->state.current_vfo;
}
sprintf(cmd_arg, "<params><param><value>%s</value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value>%s</value></param></params>",
vfo == RIG_VFO_A ? "A" : "B");
retval = flrig_transaction(rig, "rig.set_AB", cmd_arg, NULL, 0);
@ -1768,7 +1768,7 @@ static int flrig_set_vfo(RIG *rig, vfo_t vfo)
/* so if we are in split and asked for A we have to turn split back on */
if (priv->split && vfo == RIG_VFO_A)
{
sprintf(cmd_arg, "<params><param><value><i4>%d</i4></value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value><i4>%d</i4></value></param></params>",
priv->split);
retval = flrig_transaction(rig, "rig.set_split", cmd_arg, NULL, 0);
@ -1861,7 +1861,7 @@ static int flrig_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
if (tx_freq == qtx_freq) { RETURNFUNC(RIG_OK); }
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><double>%.6f</double></value></param></params>",
tx_freq);
retval = flrig_transaction(rig, "rig.set_vfoB", cmd_arg, NULL, 0);
@ -1922,7 +1922,7 @@ static int flrig_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
RETURNFUNC(RIG_OK); // just return OK and ignore this
}
sprintf(cmd_arg, "<params><param><value><i4>%d</i4></value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value><i4>%d</i4></value></param></params>",
split);
retval = flrig_transaction(rig, "rig.set_split", cmd_arg, NULL, 0);
@ -2072,7 +2072,7 @@ static int flrig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_EINVAL);
}
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><%s>%d</%s></value></param></params>",
param_type, (int)val.f, param_type);
@ -2248,15 +2248,15 @@ static int flrig_set_ext_parm(RIG *rig, token_t token, value_t val)
case RIG_CONF_COMBO:
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
break;
case RIG_CONF_NUMERIC:
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
break;
case RIG_CONF_CHECKBUTTON:
sprintf(lstr, "%s", val.i ? "ON" : "OFF");
SNPRINTF(lstr, sizeof(lstr), "%s", val.i ? "ON" : "OFF");
break;
case RIG_CONF_BUTTON:
@ -2344,11 +2344,11 @@ static int flrig_set_ext_parm(RIG *rig, setting_t parm, value_t val)
if (RIG_PARM_IS_FLOAT(parm))
{
sprintf(pstr, "%f", val.f);
SNPRINTF(pstr, sizeof(pstr), "%f", val.f);
}
else
{
sprintf(pstr, "%d", val.i);
SNPRINTF(pstr, sizeof(pstr), "%d", val.i);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s %s\n", __func__,

18
rigs/dummy/netampctl.c
Wyświetl plik

@ -69,7 +69,7 @@ static int netampctl_transaction(AMP *amp, char *cmd, int len, char *buf)
static int netampctl_open(AMP *amp)
{
int ret, len;
int ret;
//struct amp_state *rs = &amp->state;
int pamp_ver;
char cmd[CMD_MAX];
@ -78,9 +78,9 @@ static int netampctl_open(AMP *amp)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "\\dump_state\n");
SNPRINTF(cmd, sizeof(cmd), "\\dump_state\n");
ret = netampctl_transaction(amp, cmd, len, buf);
ret = netampctl_transaction(amp, cmd, strlen(cmd), buf);
if (ret <= 0)
{
@ -148,15 +148,15 @@ static int netampctl_get_freq(AMP *amp, freq_t *freq)
#if 0
static int netampctl_reset(AMP *amp, amp_reset_t reset)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "R %d\n", reset);
SNPRINTF(cmd, sizeof(cmd), "R %d\n", reset);
ret = netampctl_transaction(amp, cmd, len, buf);
ret = netampctl_transaction(amp, cmd, strlen(cmd), buf);
if (ret > 0)
{
@ -171,15 +171,15 @@ static int netampctl_reset(AMP *amp, amp_reset_t reset)
static const char *netampctl_get_info(AMP *amp)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
static char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "_\n");
SNPRINTF(cmd, sizeof(cmd), "_\n");
ret = netampctl_transaction(amp, cmd, len, buf);
ret = netampctl_transaction(amp, cmd, strlen(cmd), buf);
if (ret < 0)
{

356
rigs/dummy/netrigctl.c
Wyświetl plik

Plik diff jest za duży Load Diff

48
rigs/dummy/netrotctl.c
Wyświetl plik

@ -74,7 +74,7 @@ static int netrotctl_transaction(ROT *rot, char *cmd, int len, char *buf)
static int netrotctl_open(ROT *rot)
{
int ret, len;
int ret;
struct rot_state *rs = &rot->state;
int prot_ver;
char cmd[CMD_MAX];
@ -83,9 +83,9 @@ static int netrotctl_open(ROT *rot)
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "\\dump_state\n");
SNPRINTF(cmd, sizeof(cmd), "\\dump_state\n");
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret <= 0)
{
@ -158,16 +158,16 @@ static int netrotctl_close(ROT *rot)
static int netrotctl_set_position(ROT *rot, azimuth_t az, elevation_t el)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %f %f\n", __func__,
az, el);
len = sprintf(cmd, "P %f %f\n", az, el);
SNPRINTF(cmd, sizeof(cmd), "P %f %f\n", az, el);
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret > 0)
{
@ -181,15 +181,15 @@ static int netrotctl_set_position(ROT *rot, azimuth_t az, elevation_t el)
static int netrotctl_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "p\n");
SNPRINTF(cmd, sizeof(cmd), "p\n");
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret <= 0)
{
@ -213,15 +213,15 @@ static int netrotctl_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
static int netrotctl_stop(ROT *rot)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "S\n");
SNPRINTF(cmd, sizeof(cmd), "S\n");
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret > 0)
{
@ -236,15 +236,15 @@ static int netrotctl_stop(ROT *rot)
static int netrotctl_park(ROT *rot)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "K\n");
SNPRINTF(cmd, sizeof(cmd), "K\n");
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret > 0)
{
@ -258,15 +258,15 @@ static int netrotctl_park(ROT *rot)
static int netrotctl_reset(ROT *rot, rot_reset_t reset)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "R %d\n", reset);
SNPRINTF(cmd, sizeof(cmd), "R %d\n", reset);
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret > 0)
{
@ -280,15 +280,15 @@ static int netrotctl_reset(ROT *rot, rot_reset_t reset)
static int netrotctl_move(ROT *rot, int direction, int speed)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "M %d %d\n", direction, speed);
SNPRINTF(cmd, sizeof(cmd), "M %d %d\n", direction, speed);
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret > 0)
{
@ -302,15 +302,15 @@ static int netrotctl_move(ROT *rot, int direction, int speed)
static const char *netrotctl_get_info(ROT *rot)
{
int ret, len;
int ret;
char cmd[CMD_MAX];
static char buf[BUF_MAX];
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
len = sprintf(cmd, "_\n");
SNPRINTF(cmd, sizeof(cmd), "_\n");
ret = netrotctl_transaction(rot, cmd, len, buf);
ret = netrotctl_transaction(rot, cmd, strlen(cmd), buf);
if (ret < 0)
{

20
rigs/dummy/rot_dummy.c
Wyświetl plik

@ -503,11 +503,11 @@ static int dummy_set_level(ROT *rot, setting_t level, value_t val)
if (ROT_LEVEL_IS_FLOAT(level))
{
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
}
else
{
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s %s\n", __func__,
@ -572,15 +572,15 @@ static int dummy_set_ext_level(ROT *rot, token_t token, value_t val)
break;
case RIG_CONF_COMBO:
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
break;
case RIG_CONF_NUMERIC:
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
break;
case RIG_CONF_CHECKBUTTON:
sprintf(lstr, "%s", val.i ? "ON" : "OFF");
SNPRINTF(lstr, sizeof(lstr), "%s", val.i ? "ON" : "OFF");
break;
case RIG_CONF_BUTTON:
@ -758,11 +758,11 @@ static int dummy_set_parm(ROT *rot, setting_t parm, value_t val)
if (ROT_PARM_IS_FLOAT(parm))
{
sprintf(pstr, "%f", val.f);
SNPRINTF(pstr, sizeof(pstr), "%f", val.f);
}
else
{
sprintf(pstr, "%d", val.i);
SNPRINTF(pstr, sizeof(pstr), "%d", val.i);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s %s\n", __func__,
@ -826,15 +826,15 @@ static int dummy_set_ext_parm(ROT *rot, token_t token, value_t val)
break;
case RIG_CONF_COMBO:
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
break;
case RIG_CONF_NUMERIC:
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
break;
case RIG_CONF_CHECKBUTTON:
sprintf(lstr, "%s", val.i ? "ON" : "OFF");
SNPRINTF(lstr, sizeof(lstr), "%s", val.i ? "ON" : "OFF");
break;
case RIG_CONF_BUTTON:

28
rigs/dummy/tci1x.c
Wyświetl plik

@ -943,7 +943,7 @@ static int tci1x_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
vfo = RIG_VFO_B; // if split always TX on VFOB
}
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><double>%.0f</double></value></param></params>", freq);
value_t val;
@ -1000,7 +1000,7 @@ static int tci1x_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
RETURNFUNC(-RIG_EINVAL);
}
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><i4>%d</i4></value></param></params>",
ptt);
@ -1200,7 +1200,7 @@ static int tci1x_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
if (p) { *p = 0; } // remove any other pipe
sprintf(cmd_arg, "<params><param><value>%s</value></param></params>", pttmode);
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value>%s</value></param></params>", pttmode);
free(ttmode);
if (!priv->has_get_modeA)
@ -1256,7 +1256,7 @@ static int tci1x_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
// Need to update the bandwidth
if (width > 0 && needBW)
{
sprintf(cmd_arg, "<params><param><value><i4>%ld</i4></value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value><i4>%ld</i4></value></param></params>",
width);
retval = tci1x_transaction(rig, "rig.set_bandwidth", cmd_arg, NULL, 0);
@ -1493,7 +1493,7 @@ static int tci1x_set_vfo(RIG *rig, vfo_t vfo)
vfo = rig->state.current_vfo;
}
sprintf(cmd_arg, "<params><param><value>%s</value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value>%s</value></param></params>",
vfo == RIG_VFO_A ? "A" : "B");
retval = tci1x_transaction(rig, "rig.set_AB", cmd_arg, NULL, 0);
@ -1511,7 +1511,7 @@ static int tci1x_set_vfo(RIG *rig, vfo_t vfo)
/* so if we are in split and asked for A we have to turn split back on */
if (priv->split && vfo == RIG_VFO_A)
{
sprintf(cmd_arg, "<params><param><value><i4>%d</i4></value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value><i4>%d</i4></value></param></params>",
priv->split);
retval = tci1x_transaction(rig, "rig.set_split", cmd_arg, NULL, 0);
@ -1604,7 +1604,7 @@ static int tci1x_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
if (tx_freq == qtx_freq) { RETURNFUNC(RIG_OK); }
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><double>%.6f</double></value></param></params>",
tx_freq);
retval = tci1x_transaction(rig, "rig.set_vfoB", cmd_arg, NULL, 0);
@ -1665,7 +1665,7 @@ static int tci1x_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
RETURNFUNC(RIG_OK); // just return OK and ignore this
}
sprintf(cmd_arg, "<params><param><value><i4>%d</i4></value></param></params>",
SNPRINTF(cmd_arg, sizeof(cmd_arg), "<params><param><value><i4>%d</i4></value></param></params>",
split);
retval = tci1x_transaction(rig, "rig.set_split", cmd_arg, NULL, 0);
@ -1816,7 +1816,7 @@ static int tci1x_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
RETURNFUNC(-RIG_EINVAL);
}
sprintf(cmd_arg,
SNPRINTF(cmd_arg, sizeof(cmd_arg),
"<params><param><value><%s>%d</%s></value></param></params>",
param_type, (int)val.f, param_type);
@ -1994,15 +1994,15 @@ static int tci1x_set_ext_parm(RIG *rig, token_t token, value_t val)
case RIG_CONF_COMBO:
sprintf(lstr, "%d", val.i);
SNPRINTF(lstr, sizeof(lstr), "%d", val.i);
break;
case RIG_CONF_NUMERIC:
sprintf(lstr, "%f", val.f);
SNPRINTF(lstr, sizeof(lstr), "%f", val.f);
break;
case RIG_CONF_CHECKBUTTON:
sprintf(lstr, "%s", val.i ? "ON" : "OFF");
SNPRINTF(lstr, sizeof(lstr), "%s", val.i ? "ON" : "OFF");
break;
case RIG_CONF_BUTTON:
@ -2089,11 +2089,11 @@ static int tci1x_set_ext_parm(RIG *rig, setting_t parm, value_t val)
if (RIG_PARM_IS_FLOAT(parm))
{
sprintf(pstr, "%f", val.f);
SNPRINTF(pstr, sizeof(pstr), "%f", val.f);
}
else
{
sprintf(pstr, "%d", val.i);
SNPRINTF(pstr, sizeof(pstr), "%d", val.i);
}
rig_debug(RIG_DEBUG_VERBOSE, "%s called: %s %s\n", __func__,