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 #1611 from stefanth/Collection3/graph-rendering-speedup
[collectd.git]
/
src
/
write_sensu.c
diff --git
a/src/write_sensu.c
b/src/write_sensu.c
index
0d568fe
..
5e231a5
100644
(file)
--- a/
src/write_sensu.c
+++ b/
src/write_sensu.c
@@
-31,7
+31,6
@@
#include "common.h"
#include "configfile.h"
#include "utils_cache.h"
#include "common.h"
#include "configfile.h"
#include "utils_cache.h"
-#include <sys/socket.h>
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
@@
-284,7
+283,7
@@
static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
{
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
{
char name_buffer[5 * DATA_MAX_NAME_LEN];
char service_buffer[6 * DATA_MAX_NAME_LEN];
-
in
t i;
+
size_
t i;
char *ret_str;
char *temp_str;
char *value_str;
char *ret_str;
char *temp_str;
char *value_str;
@@
-525,11
+524,10
@@
static char *replace_str(const char *str, const char *old, /* {{{ */
} else
retlen = strlen(str);
} else
retlen = strlen(str);
- ret =
malloc(
retlen + 1);
+ ret =
calloc(1,
retlen + 1);
if (ret == NULL)
return NULL;
// added to original: not optimized, but keeps valgrind happy.
if (ret == NULL)
return NULL;
// added to original: not optimized, but keeps valgrind happy.
- memset(ret, 0, retlen + 1);
r = ret;
p = str;
r = ret;
p = str;
@@
-596,7
+594,7
@@
static char *sensu_notification_to_json(struct sensu_host *host, /* {{{ */
char *ret_str;
char *temp_str;
int status;
char *ret_str;
char *temp_str;
int status;
-
in
t i;
+
size_
t i;
int res;
// add the severity/status
switch (n->severity) {
int res;
// add the severity/status
switch (n->severity) {
@@
-840,7
+838,7
@@
static int sensu_write(const data_set_t *ds, /* {{{ */
int statuses[vl->values_len];
struct sensu_host *host = ud->data;
gauge_t *rates = NULL;
int statuses[vl->values_len];
struct sensu_host *host = ud->data;
gauge_t *rates = NULL;
-
in
t i;
+
size_
t i;
char *msg;
pthread_mutex_lock(&host->lock);
char *msg;
pthread_mutex_lock(&host->lock);
@@
-854,7
+852,7
@@
static int sensu_write(const data_set_t *ds, /* {{{ */
return -1;
}
}
return -1;
}
}
- for (i = 0; i <
(size_t)
vl->values_len; i++) {
+ for (i = 0; i < vl->values_len; i++) {
msg = sensu_value_to_json(host, ds, vl, (int) i, rates, statuses[i]);
if (msg == NULL) {
sfree(rates);
msg = sensu_value_to_json(host, ds, vl, (int) i, rates, statuses[i]);
if (msg == NULL) {
sfree(rates);