From 1a4e61b2dd08dd78adcfcd6a7df29caa2b997adb Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Sat, 9 May 2020 11:52:27 -0500
Subject: [PATCH] Fix several strerror that should be rigerror

---
 rigs/icom/frame.c   | 2 +-
 rigs/icom/icom.c    | 2 +-
 rigs/kenwood/ic10.c | 2 +-
 rigs/yaesu/ft890.c  | 2 +-
 rigs/yaesu/ft900.c  | 2 +-
 src/rig.c           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index d967b63ea..bc707a302 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -324,7 +324,7 @@ int icom_transaction(RIG *rig, int cmd, int subcmd,
 
     if (retval != RIG_OK)
     {
-        rig_debug(RIG_DEBUG_VERBOSE, "%s: failed: %s\n", __func__, strerror(retval));
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: failed: %s\n", __func__, rigerror(retval));
     }
 
     return retval;
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index c8bb68743..e50747059 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1107,7 +1107,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
         if (retval != RIG_OK)
         {
             rig_debug(RIG_DEBUG_ERR, "%s: set_vfo failed? retval=%s\n", __func__,
-                      strerror(retval));
+                      rigerror(retval));
         }
     }
 
diff --git a/rigs/kenwood/ic10.c b/rigs/kenwood/ic10.c
index dcaef09b8..25a454edb 100644
--- a/rigs/kenwood/ic10.c
+++ b/rigs/kenwood/ic10.c
@@ -819,7 +819,7 @@ int ic10_set_channel(RIG *rig, const channel_t *chan)
         if (retval != RIG_OK)
         {
             rig_debug(RIG_DEBUG_ERR, "%s: transaction failed: %s\n", __func__,
-                      strerror(retval));
+                      rigerror(retval));
             return retval;
         }
     }
diff --git a/rigs/yaesu/ft890.c b/rigs/yaesu/ft890.c
index d9338b5c5..34d5dba96 100644
--- a/rigs/yaesu/ft890.c
+++ b/rigs/yaesu/ft890.c
@@ -1313,7 +1313,7 @@ static int ft890_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
         if (err != RIG_OK)
         {
             rig_debug(RIG_DEBUG_ERR, "%s: clarifier off error: %s\n", __func__,
-                      strerror(err));
+                      rigerror(err));
         }
 
         return err;
diff --git a/rigs/yaesu/ft900.c b/rigs/yaesu/ft900.c
index c289a56d4..7e730686c 100644
--- a/rigs/yaesu/ft900.c
+++ b/rigs/yaesu/ft900.c
@@ -1319,7 +1319,7 @@ static int ft900_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
         if (err != RIG_OK)
         {
             rig_debug(RIG_DEBUG_ERR, "%s: clarifier off error: %s\n", __func__,
-                      strerror(err));
+                      rigerror(err));
         }
 
         return err;
diff --git a/src/rig.c b/src/rig.c
index 029671ee1..1e77a9170 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1818,7 +1818,7 @@ int HAMLIB_API rig_set_vfo(RIG *rig, vfo_t vfo)
     }
     else
     {
-	rig_debug(RIG_DEBUG_ERR, "%s: set_vfo failed with '%s'\n", __func__, strerror(retcode));
+	rig_debug(RIG_DEBUG_ERR, "%s: set_vfo %s failed with '%s'\n", __func__, rig_strvfo(vfo), rigerror(retcode));
     }
 
     // we need to update our internal freq to avoid getting detected as twiddling