X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_sensu.c;h=333993084166913ba8dbe559098c013b9a10eccf;hb=b76f88c5bafa82e3c939eb65c13acd431e07cc01;hp=2336541b63594f33d750ecd3203b8b0e6024f8d4;hpb=584f57cc8cfb14cbcc45714db5dc87304ccb2a0e;p=collectd.git

diff --git a/src/write_sensu.c b/src/write_sensu.c
index 2336541b..33399308 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -46,7 +46,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
@@ -70,7 +70,7 @@ int vasprintf(char **str, const char *fmt, va_list args) {
 	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
@@ -258,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*/
 
-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,
@@ -455,7 +455,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) {
@@ -550,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.
  */
-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;
@@ -752,7 +752,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) {