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 dummy 

https://github.com/Hamlib/Hamlib/issues/857
pull/943/head
Mike Black W9MDB 2022-01-18 23:16:45 -06:00
rodzic 58d650a872
commit 52ca1f5dfa
4 zmienionych plików z 21 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -279,7 +279,6 @@ static char *xml_build(RIG *rig, char *cmd, char *value, char *xmlbuf,
char xml[4096]; // we shouldn't need more the 4096 bytes for this
char tmp[32];
char *header;
int n;
// We want at least a 4K buf to play with
if (xmlbuflen < 4096)
@ -291,24 +290,12 @@ static char *xml_build(RIG *rig, char *cmd, char *value, char *xmlbuf,
header =
"POST /RPC2 HTTP/1.1\r\n" "User-Agent: XMLRPC++ 0.8\r\n"
"Host: 127.0.0.1:12345\r\n" "Content-type: text/xml\r\n";
n = snprintf(xmlbuf, xmlbuflen, "%s", header);
SNPRINTF(xmlbuf, xmlbuflen, "%s", header);
if (n != strlen(header))
{
rig_debug(RIG_DEBUG_ERR, "%s: snprintf of header failed, len=%d, got=%d\n",
__func__, (int)strlen(header), n);
}
n = snprintf(xml, sizeof(xml),
SNPRINTF(xml, sizeof(xml),
"<?xml version=\"1.0\"?>\r\n<?clientid=\"hamlib(%d)\"?>\r\n",
rig->state.rigport.client_port);
if (n != strlen(xml))
{
rig_debug(RIG_DEBUG_ERR, "%s: snprintf of xml failed, len=%d, got=%d\n",
__func__, (int)strlen(header), n);
}
strncat(xml, "<methodCall><methodName>", sizeof(xml) - 1);
strncat(xml, cmd, sizeof(xml) - strlen(xml) - 1);
strncat(xml, "</methodName>\r\n", sizeof(xml) - strlen(xml) - 1);
@ -320,7 +307,7 @@ static char *xml_build(RIG *rig, char *cmd, char *value, char *xmlbuf,
strncat(xml, "</methodCall>\r\n", sizeof(xml) - 1);
strncat(xmlbuf, "Content-length: ", xmlbuflen - 1);
snprintf(tmp, sizeof(tmp), "%d\r\n\r\n", (int)strlen(xml));
SNPRINTF(tmp, sizeof(tmp), "%d\r\n\r\n", (int)strlen(xml));
strncat(xmlbuf, tmp, xmlbuflen - 1);
strncat(xmlbuf, xml, xmlbuflen - 1);
return xmlbuf;
@ -711,7 +698,7 @@ static rmode_t modeMapGetHamlib(const char *modeFLRig)
ENTERFUNC;
snprintf(modeFLRigCheck, sizeof(modeFLRigCheck), "|%s|", modeFLRig);
SNPRINTF(modeFLRigCheck, sizeof(modeFLRigCheck), "|%s|", modeFLRig);
for (i = 0; modeMap[i].mode_hamlib != 0; ++i)
{

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

@ -155,7 +155,7 @@ static int netrigctl_vfostr(RIG *rig, char *vfostr, int len, vfo_t vfo)
default: myvfo = "VFOA";
}
snprintf(vfostr, len, " %s", myvfo);
SNPRINTF(vfostr, len, " %s", myvfo);
}
return RIG_OK;
@ -1917,7 +1917,7 @@ static int netrigctl_set_level(RIG *rig, vfo_t vfo, setting_t level,
if (ret != RIG_OK) { return ret; }
snprintf(cmd, sizeof(cmd), "L%s %s %s\n", vfostr, rig_strlevel(level),
SNPRINTF(cmd, sizeof(cmd), "L%s %s %s\n", vfostr, rig_strlevel(level),
lstr);
ret = netrigctl_transaction(rig, cmd, strlen(cmd), buf);
@ -2034,7 +2034,7 @@ static int netrigctl_set_parm(RIG *rig, setting_t parm, value_t val)
SNPRINTF(pstr, sizeof(pstr), "%d", val.i);
}
snprintf(cmd, sizeof(cmd), "P %s %s\n", rig_strparm(parm), pstr);
SNPRINTF(cmd, sizeof(cmd), "P %s %s\n", rig_strparm(parm), pstr);
ret = netrigctl_transaction(rig, cmd, strlen(cmd), buf);
@ -2595,7 +2595,7 @@ static int netrigctl_power2mW(RIG *rig, unsigned int *mwpower, float power,
ENTERFUNC;
// we shouldn't need any precision than microwatts
snprintf(cmdbuf, sizeof(cmdbuf), "\\power2mW %.3f %.0f %s\n", power, freq,
SNPRINTF(cmdbuf, sizeof(cmdbuf), "\\power2mW %.3f %.0f %s\n", power, freq,
rig_strrmode(mode));
ret = netrigctl_transaction(rig, cmdbuf, strlen(cmdbuf), buf);

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

@ -515,7 +515,7 @@ static rmode_t modeMapGetHamlib(const char *modeTCI)
ENTERFUNC;
snprintf(modeTCICheck, sizeof(modeTCICheck), "|%s|", modeTCI);
SNPRINTF(modeTCICheck, sizeof(modeTCICheck), "|%s|", modeTCI);
for (i = 0; modeMap[i].mode_hamlib != 0; ++i)
{

24
rigs/dummy/trxmanager.c
Wyświetl plik

@ -441,7 +441,7 @@ static int trxmanager_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
}
vfoab = vfo == RIG_VFO_A ? 'R' : 'T';
snprintf(cmd, sizeof(cmd), "X%c;", vfoab);
SNPRINTF(cmd, sizeof(cmd), "X%c;", vfoab);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -511,7 +511,7 @@ static int trxmanager_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
}
vfoab = vfo == RIG_VFO_A ? 'A' : 'B';
snprintf(cmd, sizeof(cmd), "F%c%011lu;", vfoab, (unsigned long)freq);
SNPRINTF(cmd, sizeof(cmd), "F%c%011lu;", vfoab, (unsigned long)freq);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -550,7 +550,7 @@ static int trxmanager_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "%s;", ptt == 1 ? "TX" : "RX");
SNPRINTF(cmd, sizeof(cmd), "%s;", ptt == 1 ? "TX" : "RX");
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -589,7 +589,7 @@ static int trxmanager_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s\n", __func__,
rig_strvfo(vfo));
snprintf(cmd, sizeof(cmd), "IF;");
SNPRINTF(cmd, sizeof(cmd), "IF;");
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -714,7 +714,7 @@ static int trxmanager_set_mode(RIG *rig, vfo_t vfo, rmode_t mode,
}
snprintf(cmd, sizeof(cmd), "MD%c;", ttmode);
SNPRINTF(cmd, sizeof(cmd), "MD%c;", ttmode);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -777,7 +777,7 @@ static int trxmanager_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
rig_debug(RIG_DEBUG_TRACE, "%s: using vfo=%s\n", __func__,
rig_strvfo(vfo));
snprintf(cmd, sizeof(cmd), "MD;");
SNPRINTF(cmd, sizeof(cmd), "MD;");
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -850,7 +850,7 @@ static int trxmanager_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode,
rig_debug(RIG_DEBUG_VERBOSE, "%s: mode='%s'\n", __func__, rig_strrmode(*mode));
// now get the bandwidth
snprintf(cmd, sizeof(cmd), "BW;");
SNPRINTF(cmd, sizeof(cmd), "BW;");
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -917,7 +917,7 @@ static int trxmanager_set_vfo(RIG *rig, vfo_t vfo)
vfo = priv->vfo_curr;
}
snprintf(cmd, sizeof(cmd), "FN%d;", vfo == RIG_VFO_A ? 0 : 1);
SNPRINTF(cmd, sizeof(cmd), "FN%d;", vfo == RIG_VFO_A ? 0 : 1);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -1002,7 +1002,7 @@ static int trxmanager_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
return -RIG_EINVAL;
}
snprintf(cmd, sizeof(cmd), "XT%011lu;", (unsigned long) tx_freq);
SNPRINTF(cmd, sizeof(cmd), "XT%011lu;", (unsigned long) tx_freq);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -1070,7 +1070,7 @@ static int trxmanager_set_split_vfo(RIG *rig, vfo_t vfo, split_t split,
if (tsplit == split) { return RIG_OK; } // don't need to change it
snprintf(cmd, sizeof(cmd), "SP%c;", split ? '1' : '0');
SNPRINTF(cmd, sizeof(cmd), "SP%c;", split ? '1' : '0');
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -1112,7 +1112,7 @@ static int trxmanager_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split,
rig->state.priv;
rig_debug(RIG_DEBUG_TRACE, "%s\n", __func__);
snprintf(cmd, sizeof(cmd), "SP;");
SNPRINTF(cmd, sizeof(cmd), "SP;");
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)
@ -1165,7 +1165,7 @@ static int trxmanager_set_split_freq_mode(RIG *rig, vfo_t vfo, freq_t freq,
// assume split is on B
//
snprintf(cmd, sizeof(cmd), "XT%011lu;", (unsigned long)freq);
SNPRINTF(cmd, sizeof(cmd), "XT%011lu;", (unsigned long)freq);
retval = write_block(&rs->rigport, (unsigned char *) cmd, strlen(cmd));
if (retval < 0)