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 #3353 from mrunge/master
[collectd.git]
/
src
/
tail_csv.c
diff --git
a/src/tail_csv.c
b/src/tail_csv.c
index
48f3d74
..
ab8bf6d
100644
(file)
--- a/
src/tail_csv.c
+++ b/
src/tail_csv.c
@@
-23,9
+23,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "
common.h" /* auxiliary function
s */
-#include "
plugin.h" /* plugin_register_*, plugin_dispatch_value
s */
-#include "utils
_
tail.h"
+#include "
plugin.h" /* plugin_register_*, plugin_dispatch_value
s */
+#include "
utils/common/common.h" /* auxiliary function
s */
+#include "utils
/tail/
tail.h"
#include <fcntl.h>
#include <stdlib.h>
#include <fcntl.h>
#include <stdlib.h>
@@
-143,7
+143,7
@@
static int tcsv_read_buffer(instance_definition_t *id, char *buffer,
while (buffer_size > 0) {
if ((buffer[buffer_size - 1] == '\n') ||
(buffer[buffer_size - 1] == '\r')) {
while (buffer_size > 0) {
if ((buffer[buffer_size - 1] == '\n') ||
(buffer[buffer_size - 1] == '\r')) {
- buffer[buffer_size - 1] =
0
;
+ buffer[buffer_size - 1] =
'\0'
;
buffer_size--;
} else {
break;
buffer_size--;
} else {
break;
@@
-482,7
+482,8
@@
static int tcsv_config_add_file(oconfig_item_t *ci) {
status = plugin_register_complex_read(
NULL, cb_name, tcsv_read, interval,
&(user_data_t){
status = plugin_register_complex_read(
NULL, cb_name, tcsv_read, interval,
&(user_data_t){
- .data = id, .free_func = tcsv_instance_definition_destroy,
+ .data = id,
+ .free_func = tcsv_instance_definition_destroy,
});
if (status != 0) {
ERROR("tail_csv plugin: Registering complex read function failed.");
});
if (status != 0) {
ERROR("tail_csv plugin: Registering complex read function failed.");