From ed4b77726a7ed54977e09baa05e9fbbc11a12db4 Mon Sep 17 00:00:00 2001
From: Michael Black <mdblack98@yahoo.com>
Date: Sun, 15 Mar 2020 09:52:47 -0500
Subject: [PATCH] Add VFO None for available VFOS

---
 src/misc.c         | 14 ++------------
 tests/sprintflst.c |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/misc.c b/src/misc.c
index 41e166c9f..a81e3d962 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -462,7 +462,7 @@ static struct
     { RIG_VFO_SUB, "Sub" },
     { RIG_VFO_SUB_A, "SubA" },
     { RIG_VFO_SUB_B, "SubB" },
-    { RIG_VFO_NONE, "" },
+    { RIG_VFO_NONE, "None" },
 };
 
 
@@ -502,14 +502,9 @@ const char *HAMLIB_API rig_strvfo(vfo_t vfo)
 {
     int i;
 
-    //a git too verbose
+    //a bit too verbose
     //rig_debug(RIG_DEBUG_TRACE, "%s called\n", __func__);
 
-    if (vfo == RIG_VFO_NONE)
-    {
-        return "";
-    }
-
     for (i = 0 ; vfo_str[i].str[0] != '\0'; i++)
     {
         if (vfo == vfo_str[i].vfo)
@@ -950,11 +945,6 @@ const char *HAMLIB_API rig_strvfop(vfo_op_t op)
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
-    if (op == RIG_OP_NONE)
-    {
-        return "";
-    }
-
     for (i = 0; vfo_op_str[i].str[0] != '\0'; i++)
     {
         if (op == vfo_op_str[i].vfo_op)
diff --git a/tests/sprintflst.c b/tests/sprintflst.c
index 634974ad1..0d9b81544 100644
--- a/tests/sprintflst.c
+++ b/tests/sprintflst.c
@@ -57,7 +57,7 @@ int sprintf_vfo(char *str, vfo_t vfo)
         const char *sv;
         sv = rig_strvfo(vfo & RIG_VFO_N(i));
 
-        if (sv && sv[0])
+        if (sv && sv[0] && strstr(str,"None")==0)
         {
             len += sprintf(str + len, "%s ", sv);
         }