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.5'
[collectd.git]
/
src
/
write_sensu.c
diff --git
a/src/write_sensu.c
b/src/write_sensu.c
index
507018f
..
3339930
100644
(file)
--- a/
src/write_sensu.c
+++ b/
src/write_sensu.c
@@
-29,7
+29,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>
@@
-47,7
+46,7
@@
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
-int vasprintf(char **str, const char *fmt, va_list args) {
+
static
int vasprintf(char **str, const char *fmt, va_list args) {
int size = 0;
va_list tmpa;
// copy
int size = 0;
va_list tmpa;
// copy
@@
-71,7
+70,7
@@
int vasprintf(char **str, const char *fmt, va_list args) {
return size;
}
return size;
}
-int asprintf(char **str, const char *fmt, ...) {
+
static
int asprintf(char **str, const char *fmt, ...) {
int size = 0;
va_list args;
// init variadic argumens
int size = 0;
va_list args;
// init variadic argumens
@@
-259,7
+258,7
@@
static char *build_json_str_list(const char *tag, struct str_list const *list) /
return ret_str;
} /* }}} char *build_json_str_list*/
return ret_str;
} /* }}} char *build_json_str_list*/
-int sensu_format_name2(char *ret, int ret_len,
+
static
int sensu_format_name2(char *ret, int ret_len,
const char *hostname,
const char *plugin, const char *plugin_instance,
const char *type, const char *type_instance,
const char *hostname,
const char *plugin, const char *plugin_instance,
const char *type, const char *type_instance,
@@
-329,7
+328,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;
@@
-456,7
+455,7
@@
static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
}
// incorporate sensu tags from config if any
}
// incorporate sensu tags from config if any
- if (
strlen(sensu_tags) != 0
) {
+ if (
(sensu_tags != NULL) && (strlen(sensu_tags) != 0)
) {
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
@@
-551,7
+550,7
@@
static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
* http://creativeandcritical.net/str-replace-c/
* copyright (c) Laird Shaw, under public domain.
*/
* http://creativeandcritical.net/str-replace-c/
* copyright (c) Laird Shaw, under public domain.
*/
-char *replace_str(const char *str, const char *old, /* {{{ */
+
static
char *replace_str(const char *str, const char *old, /* {{{ */
const char *new)
{
char *ret, *r;
const char *new)
{
char *ret, *r;
@@
-641,7
+640,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) {
@@
-753,7
+752,7
@@
static char *sensu_notification_to_json(struct sensu_host *host, /* {{{ */
}
// incorporate sensu tags from config if any
}
// incorporate sensu tags from config if any
- if (
strlen(sensu_tags) != 0
) {
+ if (
(sensu_tags != NULL) && (strlen(sensu_tags) != 0)
) {
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
res = asprintf(&temp_str, "%s, %s", ret_str, sensu_tags);
free(ret_str);
if (res == -1) {
@@
-885,7
+884,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);
@@
-899,7
+898,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);