From: Gerhard Sittig Date: Wed, 15 Mar 2023 16:52:40 +0000 (+0100) Subject: rdtech-um: eliminate redundant data types in memory allocation X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bc9aa94b92c5ac0271769af4605992d7a38e65bc;p=libsigrok.git rdtech-um: eliminate redundant data types in memory allocation Just allocate the size of the involved variable. Eliminate redundant data type specs where inconsistency would go unnoticed. Link the device context earlier to the device instance while we are here. Immediately after allocation of the dynamic memory so that the relation remains obvious. --- diff --git a/src/hardware/rdtech-um/api.c b/src/hardware/rdtech-um/api.c index 863ba972..3f086ae6 100644 --- a/src/hardware/rdtech-um/api.c +++ b/src/hardware/rdtech-um/api.c @@ -67,19 +67,18 @@ static GSList *rdtech_um_scan(struct sr_dev_driver *di, goto err_out_serial; } - devc = g_malloc0(sizeof(struct dev_context)); - sdi = g_malloc0(sizeof(struct sr_dev_inst)); - + devc = g_malloc0(sizeof(*devc)); sr_sw_limits_init(&devc->limits); devc->profile = p; + sdi = g_malloc0(sizeof(*sdi)); + sdi->priv = devc; sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("RDTech"); sdi->model = g_strdup(p->model_name); sdi->version = NULL; sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - sdi->priv = devc; for (ch_idx = 0; (name = p->channels[ch_idx].name); ch_idx++) sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, name);