projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[collectd.git]
/
src
/
write_redis.c
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
72cb594
..
d8cc94f
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <hiredis/hiredis.h>
#include <sys/time.h>
#include <hiredis/hiredis.h>
#include <sys/time.h>
@@
-71,9
+71,9
@@
static int wr_write(const data_set_t *ds, /* {{{ */
status = FORMAT_VL(ident, sizeof(ident), vl);
if (status != 0)
return status;
status = FORMAT_VL(ident, sizeof(ident), vl);
if (status != 0)
return status;
- snprintf(key, sizeof(key), "%s%s",
+ s
s
nprintf(key, sizeof(key), "%s%s",
(node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX, ident);
(node->prefix != NULL) ? node->prefix : REDIS_DEFAULT_PREFIX, ident);
- snprintf(time, sizeof(time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
+ s
s
nprintf(time, sizeof(time), "%.9f", CDTIME_T_TO_DOUBLE(vl->time));
value_size = sizeof(value);
value_ptr = &value[0];
value_size = sizeof(value);
value_ptr = &value[0];
@@
-239,7
+239,7
@@
static int wr_config_node(oconfig_item_t *ci) /* {{{ */
if (status == 0) {
char cb_name[sizeof("write_redis/") + DATA_MAX_NAME_LEN];
if (status == 0) {
char cb_name[sizeof("write_redis/") + DATA_MAX_NAME_LEN];
- snprintf(cb_name, sizeof(cb_name), "write_redis/%s", node->name);
+ s
s
nprintf(cb_name, sizeof(cb_name), "write_redis/%s", node->name);
status =
plugin_register_write(cb_name, wr_write,
status =
plugin_register_write(cb_name, wr_write,