From f0821041a2c48a2c6da5e5f437a72ebdd291c360 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Wed, 2 Aug 2023 17:03:22 -0500
Subject: [PATCH] Fix cppcheck warnings

---
 rigs/aor/aor.c     | 6 +++---
 rigs/aor/ar7030p.c | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index 34a8374c1..88016eacf 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -271,8 +271,8 @@ int aor_set_vfo(RIG *rig, vfo_t vfo)
     case RIG_VFO_MEM: vfocmd = "MR" EOM; break;
 
     default:
-        rig_debug(RIG_DEBUG_ERR, "aor_set_vfo: unsupported vfo %d\n",
-                  vfo);
+        rig_debug(RIG_DEBUG_ERR, "aor_set_vfo: unsupported vfo %s\n",
+                  rig_strvfo(vfo));
         return -RIG_EINVAL;
     }
 
@@ -760,7 +760,7 @@ int aor_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
         if (att > HAMLIB_MAXDBLSTSIZ || rs->attenuator[att - 1] == 0)
         {
-            rig_debug(RIG_DEBUG_ERR, "Unsupported att %s %d\n",
+            rig_debug(RIG_DEBUG_ERR, "Unsupported att %s %u\n",
                       __func__, att);
             return -RIG_EPROTO;
         }
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index eb0aa99d3..8efe1b398 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -333,6 +333,8 @@ static int ar7030p_cleanup(RIG *rig)
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
+    if (priv == NULL) return RIG_OK;
+
     for (i = 0; i < NB_CHAN; i++)
     {
         free(priv->mem[ i ].ext_levels);
@@ -343,10 +345,7 @@ static int ar7030p_cleanup(RIG *rig)
 
     free(priv->ext_parms);
 
-    if (NULL != rig->state.priv)
-    {
-        free(rig->state.priv);
-    }
+    free(rig->state.priv);
 
     rig->state.priv = NULL;