projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
amqp, write_graphite and write_kafka plugins: Implement the "[Graphite]PreserveSepara...
[collectd.git]
/
src
/
sigrok.c
diff --git
a/src/sigrok.c
b/src/sigrok.c
index
6c781f8
..
6a8003c
100644
(file)
--- a/
src/sigrok.c
+++ b/
src/sigrok.c
@@
-20,6
+20,7
@@
*/
#include "collectd.h"
*/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-27,7
+28,6
@@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include <pthread.h>
#include <glib.h>
#include <libsigrok/libsigrok.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;
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.");
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;
}
cfdev->min_dispatch_interval = DEFAULT_MIN_DISPATCH_INTERVAL;
- for (i = 0; i < ci->children_num; i++) {
+ for (i
nt 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);
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)
{
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;
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;
{
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;
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. */
cfdev = l->data;
if (cfdev->sdi == sdi) {
/* Found it. */
@@
-203,13
+198,10
@@
static void sigrok_feed_callback(const struct sr_dev_inst *sdi,
/* Ignore all but the first sample on the first probe. */
analog = packet->payload;
/* 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;
vl.values_len = 1;
- sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, "sigrok", sizeof(vl.plugin));
sstrncpy(vl.plugin, "sigrok", sizeof(vl.plugin));
- ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance),
- "%s", cfdev->name);
+ sstrncpy(vl.plugin_instance, cfdev->name, sizeof(vl.plugin_instance));
sstrncpy(vl.type, sigrok_value_type(analog), sizeof(vl.type));
plugin_dispatch_values(&vl);
sstrncpy(vl.type, sigrok_value_type(analog), sizeof(vl.type));
plugin_dispatch_values(&vl);
@@
-360,7
+352,7
@@
static int sigrok_init(void)
}
status = plugin_thread_create(&sr_thread, NULL, sigrok_read_thread,
}
status = plugin_thread_create(&sr_thread, NULL, sigrok_read_thread,
- NULL);
+ NULL
, "sigrok read"
);
if (status != 0)
{
char errbuf[1024];
if (status != 0)
{
char errbuf[1024];