X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwrite_sensu.c;h=1956458cb504ddd1684f9639300c9ed6dc8342d4;hb=94d84b7b773e9d140b81699d1d42a9e461a5b76d;hp=507018fdd1f6a7688a0672679fdcd63628d58fe3;hpb=f9a6df05238501ca41931af0d8d51acea716c105;p=collectd.git

diff --git a/src/write_sensu.c b/src/write_sensu.c
index 507018fd..1956458c 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -47,7 +47,7 @@
 #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
@@ -259,7 +259,7 @@ static char *build_json_str_list(const char *tag, struct str_list const *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,
@@ -456,7 +456,7 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
 	}
 
 	// 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) {
@@ -551,7 +551,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.
  */
-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;
@@ -753,7 +753,7 @@ static char *sensu_notification_to_json(struct sensu_host *host, /* {{{ */
 	}
 
 	// 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) {