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 #3144 from rpv-tomsk/lua
[collectd.git]
/
src
/
csv.c
diff --git
a/src/csv.c
b/src/csv.c
index
f5126d2
..
953473f
100644
(file)
--- a/
src/csv.c
+++ b/
src/csv.c
@@
-23,8
+23,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include "utils_cache.h"
/*
#include "utils_cache.h"
/*
@@
-33,9
+33,9
@@
static const char *config_keys[] = {"DataDir", "StoreRates"};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
static const char *config_keys[] = {"DataDir", "StoreRates"};
static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
-static char *datadir
= NULL
;
-static int store_rates
= 0
;
-static int use_stdio
= 0
;
+static char *datadir;
+static int store_rates;
+static int use_stdio;
static int value_list_to_string(char *buffer, int buffer_len,
const data_set_t *ds, const value_list_t *vl) {
static int value_list_to_string(char *buffer, int buffer_len,
const data_set_t *ds, const value_list_t *vl) {
@@
-190,12
+190,12
@@
static int csv_config(const char *key, const char *value) {
}
datadir = strdup(value);
if (datadir != NULL) {
}
datadir = strdup(value);
if (datadir != NULL) {
-
in
t len = strlen(datadir);
+
size_
t len = strlen(datadir);
while ((len > 0) && (datadir[len - 1] == '/')) {
len--;
datadir[len] = '\0';
}
while ((len > 0) && (datadir[len - 1] == '/')) {
len--;
datadir[len] = '\0';
}
- if (len
<
= 0) {
+ if (len
=
= 0) {
free(datadir);
datadir = NULL;
}
free(datadir);
datadir = NULL;
}