From 9c16b553370b2dc5ca9f83bd7d4c102a66c2daad Mon Sep 17 00:00:00 2001 From: Michael Black Date: Sun, 12 Jan 2020 22:45:31 -0600 Subject: [PATCH] Fix cppcheck warning in netrigctl.c --- dummy/netrigctl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dummy/netrigctl.c b/dummy/netrigctl.c index 12d872f6d..3c98344ef 100644 --- a/dummy/netrigctl.c +++ b/dummy/netrigctl.c @@ -141,14 +141,15 @@ static int netrigctl_init(RIG *rig) return -RIG_EINVAL; } + rig->state.priv = (struct netrigctl_priv_data *)malloc(sizeof( + struct netrigctl_priv_data)); - priv = (struct netrigctl_priv_data *)malloc(sizeof(struct netrigctl_priv_data)); - - if (!priv) + if (!rig->state.priv) { return -RIG_ENOMEM; } + priv = rig->state.priv; memset(priv, 0, sizeof(struct netrigctl_priv_data)); rig_debug(RIG_DEBUG_TRACE, "%s version %s\n", __func__, rig->caps->version); @@ -157,11 +158,9 @@ static int netrigctl_init(RIG *rig) * set arbitrary initial status * VFO will be updated in open call */ - rig->state.priv = (rig_ptr_t) priv; priv->vfo_curr = RIG_VFO_A; priv->rigctld_vfo_mode = 0; - return RIG_OK; }