X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsigrok.c;h=5b850040f30b4f324e29480172b402e7d55a3ea6;hb=1aa4295ba6875ceb02a7383237bc2485ffab9c1e;hp=6c781f81c50a56597be7cfa376a776158dcd687a;hpb=d67b510b1ec7c17b6e1f65e40b8d8fdb2f33c857;p=collectd.git

diff --git a/src/sigrok.c b/src/sigrok.c
index 6c781f81..5b850040 100644
--- a/src/sigrok.c
+++ b/src/sigrok.c
@@ -20,6 +20,7 @@
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -27,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <pthread.h>
 
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
@@ -70,7 +70,6 @@ static int sigrok_log_callback(void*cb_data __attribute__((unused)),
 static int sigrok_config_device(oconfig_item_t *ci)
 {
 	struct config_device *cfdev;
-	int i;
 
 	if (!(cfdev = calloc(1, sizeof(*cfdev)))) {
 		ERROR("sigrok plugin: calloc failed.");
@@ -83,7 +82,7 @@ static int sigrok_config_device(oconfig_item_t *ci)
 	}
 	cfdev->min_dispatch_interval = DEFAULT_MIN_DISPATCH_INTERVAL;
 
-	for (i = 0; i < ci->children_num; i++) {
+	for (int i = 0; i < ci->children_num; i++) {
 		oconfig_item_t *item = ci->children + i;
 		if (!strcasecmp(item->key, "driver"))
 			cf_util_get_string(item, &cfdev->driver);
@@ -105,9 +104,7 @@ static int sigrok_config_device(oconfig_item_t *ci)
 
 static int sigrok_config(oconfig_item_t *ci)
 {
-	int i;
-
-	for (i = 0; i < ci->children_num; i++) {
+	for (int i = 0; i < ci->children_num; i++) {
 		oconfig_item_t *item = ci->children + i;
 		if (strcasecmp("LogLevel", item->key) == 0) {
 			int status;
@@ -164,13 +161,11 @@ static void sigrok_feed_callback(const struct sr_dev_inst *sdi,
 {
 	const struct sr_datafeed_analog *analog;
 	struct config_device *cfdev;
-	GSList *l;
-	value_t value;
 	value_list_t vl = VALUE_LIST_INIT;
 
 	/* Find this device's configuration. */
 	cfdev = NULL;
-	for (l = config_devices; l; l = l->next) {
+	for (GSList *l = config_devices; l; l = l->next) {
 		cfdev = l->data;
 		if (cfdev->sdi == sdi) {
 			/* Found it. */
@@ -203,8 +198,7 @@ static void sigrok_feed_callback(const struct sr_dev_inst *sdi,
 
 	/* Ignore all but the first sample on the first probe. */
 	analog = packet->payload;
-	value.gauge = analog->data[0];
-	vl.values = &value;
+	vl.values = &(value_t) { .gauge = analog->data[0] };
 	vl.values_len = 1;
 	sstrncpy(vl.host, hostname_g, sizeof(vl.host));
 	sstrncpy(vl.plugin, "sigrok", sizeof(vl.plugin));