From: Gerhard Sittig <redacted>
Date: Mon, 2 Oct 2017 15:26:52 +0000 (+0100)
Subject: device: rephrase sizeof() calls for reduced redundancy, use malloc0
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=e47a9562e990c44cd6915cde8bab270ff41ec9d7

device: rephrase sizeof() calls for reduced redundancy, use malloc0

Just allocate the memory needed to hold the very variable's size. No
need to duplicate the variable's type. Reduces redundancy and increases
robustness during maintenance.

Use g_malloc0() in sr_serial_new() to make sure all of the structure is
initialized.
---

diff --git a/src/device.c b/src/device.c
index e7be567d..20ab882b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -62,7 +62,7 @@ SR_PRIV struct sr_channel *sr_channel_new(struct sr_dev_inst *sdi,
 {
 	struct sr_channel *ch;
 
-	ch = g_malloc0(sizeof(struct sr_channel));
+	ch = g_malloc0(sizeof(*ch));
 	ch->sdi = sdi;
 	ch->index = index;
 	ch->type = type;
@@ -405,7 +405,7 @@ SR_API struct sr_dev_inst *sr_dev_inst_user_new(const char *vendor,
 {
 	struct sr_dev_inst *sdi;
 
-	sdi = g_malloc0(sizeof(struct sr_dev_inst));
+	sdi = g_malloc0(sizeof(*sdi));
 
 	sdi->vendor = g_strdup(vendor);
 	sdi->model = g_strdup(model);
@@ -495,7 +495,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 {
 	struct sr_usb_dev_inst *udi;
 
-	udi = g_malloc0(sizeof(struct sr_usb_dev_inst));
+	udi = g_malloc0(sizeof(*udi));
 	udi->bus = bus;
 	udi->address = address;
 	udi->devhdl = hdl;
@@ -544,7 +544,7 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 {
 	struct sr_serial_dev_inst *serial;
 
-	serial = g_malloc0(sizeof(struct sr_serial_dev_inst));
+	serial = g_malloc0(sizeof(*serial));
 	serial->port = g_strdup(port);
 	if (serialcomm)
 		serial->serialcomm = g_strdup(serialcomm);
@@ -576,7 +576,7 @@ SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
 {
 	struct sr_usbtmc_dev_inst *usbtmc;
 
-	usbtmc = g_malloc0(sizeof(struct sr_usbtmc_dev_inst));
+	usbtmc = g_malloc0(sizeof(*usbtmc));
 	usbtmc->device = g_strdup(device);
 	usbtmc->fd = -1;
 
diff --git a/src/serial.c b/src/serial.c
index 2d67a800..8e9e9ec6 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -882,7 +882,7 @@ static struct sr_serial_port *sr_serial_new(const char *name,
 	if (!name)
 		return NULL;
 
-	serial = g_malloc(sizeof(struct sr_serial_port));
+	serial = g_malloc0(sizeof(*serial));
 	serial->name = g_strdup(name);
 	serial->description = g_strdup(description ? description : "");