From 17fb84044f2862c3e048024bb8974c4a27fdff42 Mon Sep 17 00:00:00 2001
From: Michael Black <mdblack98@yahoo.com>
Date: Mon, 23 Dec 2019 23:13:40 -0600
Subject: [PATCH] Fix cppcheck warning in rigsmtr.c

---
 tests/rigsmtr.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/rigsmtr.c b/tests/rigsmtr.c
index 2de0ec95c..82242a86b 100644
--- a/tests/rigsmtr.c
+++ b/tests/rigsmtr.c
@@ -428,27 +428,28 @@ void usage()
 
 int set_conf_rig(RIG *rig, char *conf_parms)
 {
-    char *p, *q, *n;
+    char *p;
     int ret;
 
     p = conf_parms;
 
     while (p && *p != '\0')
     {
+        char *q, *n = NULL;
         /* FIXME: left hand value of = cannot be null */
         q = strchr(p, '=');
 
         if (!q)
         {
             return RIG_EINVAL;
-        }
 
-        *q++ = '\0';
-        n = strchr(q, ',');
+            *q++ = '\0';
+            n = strchr(q, ',');
 
-        if (n)
-        {
-            *n++ = '\0';
+            if (n)
+            {
+                *n++ = '\0';
+            }
         }
 
         ret = rig_set_conf(rig, rig_token_lookup(rig, p), q);
@@ -467,13 +468,14 @@ int set_conf_rig(RIG *rig, char *conf_parms)
 
 int set_conf_rot(ROT *rot, char *conf_parms)
 {
-    char *p, *q, *n = NULL;
-    int ret;
+    char *p;
 
     p = conf_parms;
 
     while (p && *p != '\0')
     {
+        char *q, *n = NULL;
+        int ret;
         /* FIXME: left hand value of = cannot be null */
         q = strchr(p, '=');