From 38d7697d0377ed7b48fb63286d24966b14f28465 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Sat, 22 Jan 2022 22:37:09 -0600
Subject: [PATCH] Change snprintf to SNPRINTF in rigs
 https://github.com/Hamlib/Hamlib/issues/857

---
 rigs/barrett/barrett.c | 6 +++---
 rigs/codan/codan.c     | 6 +++---
 rigs/icom/icr75.c      | 2 +-
 rigs/tentec/paragon.c  | 5 ++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index 6fc64e724..d5c4d8a29 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -63,7 +63,7 @@ DECLARE_INITRIG_BACKEND(barrett)
 int barrett_transaction(RIG *rig, char *cmd, int expected, char **result)
 {
     char cmd_buf[MAXCMDLEN];
-    int retval, cmd_len;
+    int retval;
     char *p;
     char xon;
     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);
 
-    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);
-    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)
     {
diff --git a/rigs/codan/codan.c b/rigs/codan/codan.c
index 13191fbb4..adbe38c4f 100644
--- a/rigs/codan/codan.c
+++ b/rigs/codan/codan.c
@@ -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)
 {
     char cmd_buf[MAXCMDLEN];
-    int retval, cmd_len;
+    int retval;
     struct rig_state *rs = &rig->state;
     struct codan_priv_data *priv = rig->state.priv;
     //int retry = 3;
 
     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);
-    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);
 
     if (retval < 0)
diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c
index 9f30eabcc..a627df8a7 100644
--- a/rigs/icom/icr75.c
+++ b/rigs/icom/icr75.c
@@ -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);
     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;
 
     retval = icom_transaction(rig, C_CTL_MEM, S_MEM_CNTNT,
diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c
index 49cd1700e..80d011757 100644
--- a/rigs/tentec/paragon.c
+++ b/rigs/tentec/paragon.c
@@ -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;
 #define FREQBUFSZ 16
     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';
 
     /* 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);
 
-    return write_block(&rig->state.rigport, (unsigned char *) buf, ret);
+    return write_block(&rig->state.rigport, (unsigned char *) buf, strlen(buf));
 }
 
 /*