projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2716 from dago/kstat
[collectd.git]
/
src
/
tail_csv.c
diff --git
a/src/tail_csv.c
b/src/tail_csv.c
index
f303988
..
f963528
100644
(file)
--- a/
src/tail_csv.c
+++ b/
src/tail_csv.c
@@
-128,7
+128,7
@@
static _Bool tcsv_check_index(ssize_t index, size_t fields_num,
return 1;
ERROR("tail_csv plugin: Metric \"%s\": Request for index %zd when "
return 1;
ERROR("tail_csv plugin: Metric \"%s\": Request for index %zd when "
- "only %
zu
fields are available.",
+ "only %
" PRIsz "
fields are available.",
name, index, fields_num);
return 0;
}
name, index, fields_num);
return 0;
}
@@
-481,7
+481,7
@@
static int tcsv_config_add_file(oconfig_item_t *ci) {
return -1;
}
return -1;
}
- s
s
nprintf(cb_name, sizeof(cb_name), "tail_csv/%s", id->path);
+ snprintf(cb_name, sizeof(cb_name), "tail_csv/%s", id->path);
status = plugin_register_complex_read(
NULL, cb_name, tcsv_read, id->interval,
status = plugin_register_complex_read(
NULL, cb_name, tcsv_read, id->interval,
@@
-490,7
+490,6
@@
static int tcsv_config_add_file(oconfig_item_t *ci) {
});
if (status != 0) {
ERROR("tail_csv plugin: Registering complex read function failed.");
});
if (status != 0) {
ERROR("tail_csv plugin: Registering complex read function failed.");
- tcsv_instance_definition_destroy(id);
return -1;
}
return -1;
}
@@
-533,7
+532,7
@@
static int tcsv_init(void) { /* {{{ */
md->type, md->name);
continue;
} else if (ds->ds_num != 1) {
md->type, md->name);
continue;
} else if (ds->ds_num != 1) {
- ERROR("tail_csv plugin: The type \"%s\" has %
zu
data sources. "
+ ERROR("tail_csv plugin: The type \"%s\" has %
" PRIsz "
data sources. "
"Only types with a single data source are supported.",
ds->type, ds->ds_num);
continue;
"Only types with a single data source are supported.",
ds->type, ds->ds_num);
continue;