From 8fa81115883da81fac2dd5ef7c6e56f4c57897b1 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Sun, 12 Jan 2020 23:09:50 -0600 Subject: [PATCH] Fix cppcheck warning in fifisdr.c --- kit/fifisdr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kit/fifisdr.c b/kit/fifisdr.c index 820b49ee7..76f5e8a32 100644 --- a/kit/fifisdr.c +++ b/kit/fifisdr.c @@ -332,15 +332,17 @@ int fifisdr_init(RIG *rig) hamlib_port_t *rp = &rig->state.rigport; struct fifisdr_priv_instance_data *priv; - priv = (struct fifisdr_priv_instance_data *)calloc(sizeof( + rig->state.priv = (struct fifisdr_priv_instance_data *)calloc(sizeof( struct fifisdr_priv_instance_data), 1); - if (!priv) + if (!rig->state.priv) { /* whoops! memory shortage! */ return -RIG_ENOMEM; } + priv = rig->state.priv; + priv->multiplier = 4; rp->parm.usb.vid = USBDEV_SHARED_VID; @@ -354,8 +356,6 @@ int fifisdr_init(RIG *rig) rp->parm.usb.vendor_name = FIFISDR_VENDOR_NAME; rp->parm.usb.product = FIFISDR_PRODUCT_NAME; - rig->state.priv = (void *)priv; - return RIG_OK; }