X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=4642e5f038fdbfc83c871dc02728e2e38fb76981;hb=3a247d03595b910deba841ec8e7c312c156ae07c;hp=e7be567d20ad705ffdd3da315198e37494d2684b;hpb=8107a9a650f4db08423c3fc79c1b7e7d826ffd7f;p=libsigrok.git

diff --git a/src/device.c b/src/device.c
index e7be567d..4642e5f0 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;
@@ -518,7 +518,7 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
 
 #endif
 
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 
 /**
  * Allocate and init a struct for a serial device instance.
@@ -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;
 
@@ -814,7 +814,7 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 	struct libusb_device **devlist;
 #endif
 
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 	struct sr_serial_dev_inst *serial;
 #endif
 
@@ -824,7 +824,7 @@ SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 	if (!sdi)
 		return NULL;
 
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 	if ((!sdi->connection_id) && (sdi->inst_type == SR_INST_SERIAL)) {
 		/* connection_id isn't populated, let's do that for serial devices. */