From d217bcac629afd00d9e79ace3d049db4f558da49 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Thu, 13 Jan 2022 17:08:10 -0600 Subject: [PATCH] Change sprintf to SNPRINTF in barret https://github.com/Hamlib/Hamlib/issues/857 --- rigs/barrett/950.c | 6 +++--- rigs/barrett/barrett.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c index c7fac7205..901b670e0 100644 --- a/rigs/barrett/950.c +++ b/rigs/barrett/950.c @@ -185,7 +185,7 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq) chan, freq); // Set the channel - sprintf((char *) cmd_buf, "XC%04d", chan); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "XC%04d", chan); retval = barrett_transaction(rig, cmd_buf, 0, &response); if (retval < 0) @@ -194,7 +194,7 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq) } // Read the current channel for the requested freq to see if it needs changing - sprintf((char *) cmd_buf, "IDC%04d", chan); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "IDC%04d", chan); retval = barrett_transaction(rig, cmd_buf, 0, &response); if (retval < 0) @@ -226,7 +226,7 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq) // New freq so let's update the channel // We do not support split mode -- too many writes to EEPROM to support it - sprintf((char *) cmd_buf, "PC%04dR%08.0lfT%08.0lf", chan, freq, freq); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "PC%04dR%08.0lfT%08.0lf", chan, freq, freq); retval = barrett_transaction(rig, cmd_buf, 0, &response); if (retval != RIG_OK || strncmp(response, "OK", 2) != 0) diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c index b3bce0802..6fc64e724 100644 --- a/rigs/barrett/barrett.c +++ b/rigs/barrett/barrett.c @@ -289,7 +289,7 @@ int barrett_set_freq(RIG *rig, vfo_t vfo, freq_t freq) if (vfo != RIG_VFO_B) { char *response = NULL; - sprintf((char *) cmd_buf, "TR%08.0f", freq); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "TR%08.0f", freq); retval = barrett_transaction(rig, cmd_buf, 0, &response); if (retval < 0) @@ -311,7 +311,7 @@ int barrett_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { char *response = NULL; - sprintf((char *) cmd_buf, "TC9999T%08.0f", freq); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "TC9999T%08.0f", freq); retval = barrett_transaction(rig, cmd_buf, 0, &response); if (retval < 0) @@ -346,7 +346,7 @@ int barrett_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) // testing with rigctld worked, but from WSJT-X did not // WSJT-X is just a little faster without the network timing hl_usleep(100 * 1000); - sprintf(cmd_buf, "XP%d", ptt); + SNPRINTF(cmd_buf, sizeof(cmd_buf), "XP%d", ptt); response = NULL; retval = barrett_transaction(rig, cmd_buf, 0, &response); @@ -461,7 +461,7 @@ int barrett_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) return -RIG_EINVAL; } - sprintf((char *) cmd_buf, "TB%c" EOM, ttmode); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "TB%c" EOM, ttmode); retval = barrett_transaction(rig, cmd_buf, 0, NULL); @@ -562,7 +562,7 @@ int barrett_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq) rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s freq=%g\n", __func__, rig_strvfo(vfo), tx_freq); - sprintf((char *) cmd_buf, "TT%08.0f" EOM, tx_freq); + SNPRINTF((char *) cmd_buf, sizeof(cmd_buf), "TT%08.0f" EOM, tx_freq); retval = barrett_transaction(rig, cmd_buf, 0, NULL);