X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsigrok.c;h=4e61f946f0230874074a222986e494b16fc1dd9d;hb=1ebf2f31bd2e080e6f42de640f0a3899a61501c0;hp=487f31a1b8030edbb299affb87368849d743064c;hpb=1fc00932fd49fa535551cc4bba09c4e4be059ab4;p=collectd.git

diff --git a/src/sigrok.c b/src/sigrok.c
index 487f31a1..4e61f946 100644
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -72,7 +72,7 @@ static int sigrok_config_device(oconfig_item_t *ci)
 	struct config_device *cfdev;
 	int i;
 
-	if (!(cfdev = malloc(sizeof(struct config_device)))) {
+	if (!(cfdev = malloc(sizeof(*cfdev)))) {
 		ERROR("sigrok plugin: malloc() failed.");
 		return -1;
 	}
@@ -136,9 +136,9 @@ static int sigrok_config(oconfig_item_t *ci)
 	return 0;
 }
 
-static char *sigrok_value_type(const struct sr_datafeed_analog *analog)
+static const char *sigrok_value_type(const struct sr_datafeed_analog *analog)
 {
-	char *s;
+	const char *s;
 
 	if (analog->mq == SR_MQ_VOLTAGE)
 		s = "voltage";
@@ -236,14 +236,14 @@ static int sigrok_init_driver(struct config_device *cfdev,
 
 	drvopts = NULL;
 	if (cfdev->conn) {
-		if (!(src = malloc(sizeof(struct sr_config))))
+		if (!(src = malloc(sizeof(*src))))
 			return -1;
 		src->key = SR_CONF_CONN;
 		src->data = g_variant_new_string(cfdev->conn);
 		drvopts = g_slist_append(drvopts, src);
 	}
 	if (cfdev->serialcomm) {
-		if (!(src = malloc(sizeof(struct sr_config))))
+		if (!(src = malloc(sizeof(*src))))
 			return -1;
 		src->key = SR_CONF_SERIALCOMM;
 		src->data = g_variant_new_string(cfdev->serialcomm);