X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsigrok.c;h=6c781f81c50a56597be7cfa376a776158dcd687a;hb=b81104a423234c04f0eb4ace0ec5e93a363c917a;hp=487f31a1b8030edbb299affb87368849d743064c;hpb=6258e772d808f4e76ea8e23d9e2750cfc7e6c60d;p=collectd.git

diff --git a/src/sigrok.c b/src/sigrok.c
index 487f31a1..6c781f81 100644
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -72,11 +72,10 @@ static int sigrok_config_device(oconfig_item_t *ci)
 	struct config_device *cfdev;
 	int i;
 
-	if (!(cfdev = malloc(sizeof(struct config_device)))) {
-		ERROR("sigrok plugin: malloc() failed.");
+	if (!(cfdev = calloc(1, sizeof(*cfdev)))) {
+		ERROR("sigrok plugin: calloc failed.");
 		return -1;
 	}
-	memset(cfdev, 0, sizeof(*cfdev));
 	if (cf_util_get_string(ci, &cfdev->name)) {
 		free(cfdev);
 		WARNING("sigrok plugin: Invalid device name.");
@@ -136,9 +135,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 +235,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);