projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.8'
[collectd.git]
/
src
/
write_sensu.c
diff --git
a/src/write_sensu.c
b/src/write_sensu.c
index
3b4a574
..
bda3327
100644
(file)
--- a/
src/write_sensu.c
+++ b/
src/write_sensu.c
@@
-337,8
+337,7
@@
static void in_place_replace_sensu_name_reserved(char *orig_name) /* {{{ */
static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
data_set_t const *ds, value_list_t const *vl,
static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
data_set_t const *ds, value_list_t const *vl,
- size_t index, gauge_t const *rates,
- int status) {
+ size_t index, gauge_t const *rates) {
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
char *ret_str;
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
char *ret_str;
@@
-627,7
+626,7
@@
static char *replace_str(const char *str, const char *old, /* {{{ */
r += newlen;
p = q + oldlen;
}
r += newlen;
p = q + oldlen;
}
- sstrncpy(r, p,
sizeof(r)
);
+ sstrncpy(r, p,
retlen + 1
);
return ret;
} /* }}} char *replace_str */
return ret;
} /* }}} char *replace_str */
@@
-926,7
+925,7
@@
static int sensu_write(const data_set_t *ds, /* {{{ */
}
}
for (size_t i = 0; i < vl->values_len; i++) {
}
}
for (size_t i = 0; i < vl->values_len; i++) {
- msg = sensu_value_to_json(host, ds, vl, (int)i, rates
, statuses[i]
);
+ msg = sensu_value_to_json(host, ds, vl, (int)i, rates);
if (msg == NULL) {
sfree(rates);
pthread_mutex_unlock(&host->lock);
if (msg == NULL) {
sfree(rates);
pthread_mutex_unlock(&host->lock);