From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Apr 2015 16:48:07 +0000 (+0200)
Subject: write_sensu: fix 2 format-related details
X-Git-Tag: collectd-5.5.0~37
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=78340212;p=collectd.git

write_sensu: fix 2 format-related details

The default CC on freebsd-10 (clang 3.4) spotted these issues:

write_sensu.c:494:38: error: format specifies type 'long long' but the argument has type 'int64_t' (aka 'long') [-Werror,-Wformat]
write_sensu.c:494:45: error: data argument not used by format string [-Werror,-Wformat-extra-args]
---

diff --git a/src/write_sensu.c b/src/write_sensu.c
index aef97e5b..35db4f7b 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -469,7 +469,7 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
 	// calculate the value and set to a string
 	if (ds->ds[index].type == DS_TYPE_GAUGE) {
 		double tmp_v = (double) vl->values[index].gauge;
-		res = asprintf(&value_str, "%.8f", tmp_v, sensu_tags);
+		res = asprintf(&value_str, "%.8f", tmp_v);
 		if (res == -1) {
 			free(ret_str);
 			ERROR("write_sensu plugin: Unable to alloc memory");
@@ -477,7 +477,7 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
 		}
 	} else if (rates != NULL) {
 		double tmp_v = (double) rates[index];
-		res = asprintf(&value_str, "%.8f", tmp_v, sensu_tags);
+		res = asprintf(&value_str, "%.8f", tmp_v);
 		if (res == -1) {
 			free(ret_str);
 			ERROR("write_sensu plugin: Unable to alloc memory");
@@ -491,7 +491,7 @@ static char *sensu_value_to_json(struct sensu_host const *host, /* {{{ */
 			tmp_v = (int64_t) vl->values[index].absolute;
 		else
 			tmp_v = (int64_t) vl->values[index].counter;
-		res = asprintf(&value_str, "%lld", tmp_v, sensu_tags);
+		res = asprintf(&value_str, "%ld", tmp_v);
 		if (res == -1) {
 			free(ret_str);
 			ERROR("write_sensu plugin: Unable to alloc memory");