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
/
tail_csv.c
diff --git
a/src/tail_csv.c
b/src/tail_csv.c
index
2d794fc
..
0247387
100644
(file)
--- a/
src/tail_csv.c
+++ b/
src/tail_csv.c
@@
-22,6
+22,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
#include "common.h" /* auxiliary functions */
#include "utils_tail.h"
#include "plugin.h" /* plugin_register_*, plugin_dispatch_values */
#include "common.h" /* auxiliary functions */
#include "utils_tail.h"
@@
-68,7
+69,6
@@
static int tcsv_submit (instance_definition_t *id,
vl.values_len = 1;
vl.values = &v;
vl.values_len = 1;
vl.values = &v;
- sstrncpy(vl.host, hostname_g, sizeof (vl.host));
sstrncpy(vl.plugin, "tail_csv", sizeof(vl.plugin));
if (id->instance != NULL)
sstrncpy(vl.plugin_instance, id->instance, sizeof(vl.plugin_instance));
sstrncpy(vl.plugin, "tail_csv", sizeof(vl.plugin));
if (id->instance != NULL)
sstrncpy(vl.plugin_instance, id->instance, sizeof(vl.plugin_instance));
@@
-85,7
+85,7
@@
static int tcsv_submit (instance_definition_t *id,
static cdtime_t parse_time (char const *tbuf)
{
double t;
static cdtime_t parse_time (char const *tbuf)
{
double t;
- char *endptr =
0
;
+ char *endptr =
NULL
;
errno = 0;
t = strtod (tbuf, &endptr);
errno = 0;
t = strtod (tbuf, &endptr);
@@
-288,7
+288,6
@@
static int tcsv_config_get_index(oconfig_item_t *ci, ssize_t *ret_index) {
static int tcsv_config_add_metric(oconfig_item_t *ci){
metric_definition_t *md;
int status;
static int tcsv_config_add_metric(oconfig_item_t *ci){
metric_definition_t *md;
int status;
- int i;
md = calloc(1, sizeof(*md));
if (md == NULL)
md = calloc(1, sizeof(*md));
if (md == NULL)
@@
-306,7
+305,7
@@
static int tcsv_config_add_metric(oconfig_item_t *ci){
return (-1);
}
return (-1);
}
- for (i = 0; i < ci->children_num; ++i){
+ for (i
nt i
= 0; i < ci->children_num; ++i){
oconfig_item_t *option = ci->children + i;
if (strcasecmp("Type", option->key) == 0)
oconfig_item_t *option = ci->children + i;
if (strcasecmp("Type", option->key) == 0)
@@
-376,7
+375,6
@@
static int tcsv_config_add_instance_collect(instance_definition_t *id, oconfig_i
metric_definition_t *metric;
metric_definition_t **metric_list;
size_t metric_list_size;
metric_definition_t *metric;
metric_definition_t **metric_list;
size_t metric_list_size;
- int i;
if (ci->values_num < 1) {
WARNING("tail_csv plugin: The `Collect' config option needs at least one argument.");
if (ci->values_num < 1) {
WARNING("tail_csv plugin: The `Collect' config option needs at least one argument.");
@@
-389,7
+387,7
@@
static int tcsv_config_add_instance_collect(instance_definition_t *id, oconfig_i
return (-1);
id->metric_list = metric_list;
return (-1);
id->metric_list = metric_list;
- for (i = 0; i < ci->values_num; i++) {
+ for (i
nt i
= 0; i < ci->values_num; i++) {
char *metric_name;
if (ci->values[i].type != OCONFIG_TYPE_STRING) {
char *metric_name;
if (ci->values[i].type != OCONFIG_TYPE_STRING) {
@@
-419,11
+417,9
@@
static int tcsv_config_add_file(oconfig_item_t *ci)
{
instance_definition_t* id;
int status = 0;
{
instance_definition_t* id;
int status = 0;
- int i;
/* Registration variables */
char cb_name[DATA_MAX_NAME_LEN];
/* Registration variables */
char cb_name[DATA_MAX_NAME_LEN];
- user_data_t cb_data;
id = calloc(1, sizeof(*id));
if (id == NULL)
id = calloc(1, sizeof(*id));
if (id == NULL)
@@
-443,7
+439,7
@@
static int tcsv_config_add_file(oconfig_item_t *ci)
/* Use default interval. */
id->interval = plugin_get_interval();
/* Use default interval. */
id->interval = plugin_get_interval();
- for (i = 0; i < ci->children_num; ++i){
+ for (i
nt i
= 0; i < ci->children_num; ++i){
oconfig_item_t *option = ci->children + i;
status = 0;
oconfig_item_t *option = ci->children + i;
status = 0;
@@
-484,11
+480,12
@@
static int tcsv_config_add_file(oconfig_item_t *ci)
}
ssnprintf (cb_name, sizeof (cb_name), "tail_csv/%s", id->path);
}
ssnprintf (cb_name, sizeof (cb_name), "tail_csv/%s", id->path);
- memset(&cb_data, 0, sizeof(cb_data));
- cb_data.data = id;
- cb_data.free_func = tcsv_instance_definition_destroy;
- status = plugin_register_complex_read(NULL, cb_name, tcsv_read, id->interval, &cb_data);
+ status = plugin_register_complex_read(NULL, cb_name, tcsv_read, id->interval,
+ &(user_data_t) {
+ .data = id,
+ .free_func = tcsv_instance_definition_destroy,
+ });
if (status != 0){
ERROR("tail_csv plugin: Registering complex read function failed.");
tcsv_instance_definition_destroy(id);
if (status != 0){
ERROR("tail_csv plugin: Registering complex read function failed.");
tcsv_instance_definition_destroy(id);
@@
-500,8
+497,7
@@
static int tcsv_config_add_file(oconfig_item_t *ci)
/* Parse blocks */
static int tcsv_config(oconfig_item_t *ci){
/* Parse blocks */
static int tcsv_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 *child = ci->children + i;
if (strcasecmp("Metric", child->key) == 0)
tcsv_config_add_metric(child);
oconfig_item_t *child = ci->children + i;
if (strcasecmp("Metric", child->key) == 0)
tcsv_config_add_metric(child);
@@
-538,7
+534,7
@@
static int tcsv_init(void) { /* {{{ */
else if (ds->ds_num != 1)
{
ERROR ("tail_csv plugin: The type \"%s\" has %zu data sources. "
else if (ds->ds_num != 1)
{
ERROR ("tail_csv plugin: The type \"%s\" has %zu data sources. "
- "Only types with a single data soure are supported.",
+ "Only types with a single data sour
c
e are supported.",
ds->type, ds->ds_num);
continue;
}
ds->type, ds->ds_num);
continue;
}