projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd.conf(5): Document the gRPC plugin.
[collectd.git]
/
src
/
sigrok.c
diff --git
a/src/sigrok.c
b/src/sigrok.c
index
487f31a
..
6c781f8
100644
(file)
--- 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;
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;
}
return -1;
}
- memset(cfdev, 0, sizeof(*cfdev));
if (cf_util_get_string(ci, &cfdev->name)) {
free(cfdev);
WARNING("sigrok plugin: Invalid device name.");
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;
}
return 0;
}
-static char *sigrok_value_type(const struct sr_datafeed_analog *analog)
+static c
onst c
har *sigrok_value_type(const struct sr_datafeed_analog *analog)
{
{
- char *s;
+ c
onst c
har *s;
if (analog->mq == SR_MQ_VOLTAGE)
s = "voltage";
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) {
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) {
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);
return -1;
src->key = SR_CONF_SERIALCOMM;
src->data = g_variant_new_string(cfdev->serialcomm);