X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcommon.c;h=e396b79d4285ae6c6b324dec722a56d4151300fc;hb=fbcd49e749c383728f81174280f976ae0d2be2c7;hp=535dfad33d51febe2bb40507a8a0c6f866f4648f;hpb=5c78be034ebf8edbf2ae98e9163a38b2d61fbb68;p=collectd.git

diff --git a/src/daemon/common.c b/src/daemon/common.c
index 535dfad3..e396b79d 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -475,8 +475,8 @@ size_t strstripnewline (char *buffer)
 		if ((buffer[buffer_len - 1] != '\n')
 				&& (buffer[buffer_len - 1] != '\r'))
 			break;
-		buffer[buffer_len] = 0;
 		buffer_len--;
+		buffer[buffer_len] = 0;
 	}
 
 	return (buffer_len);
@@ -968,18 +968,17 @@ int format_values (char *ret, size_t ret_len, /* {{{ */
         for (i = 0; i < ds->ds_num; i++)
         {
                 if (ds->ds[i].type == DS_TYPE_GAUGE)
-                        BUFFER_ADD (":%f", vl->values[i].gauge);
+                        BUFFER_ADD (":"GAUGE_FORMAT, vl->values[i].gauge);
                 else if (store_rates)
                 {
                         if (rates == NULL)
                                 rates = uc_get_rate (ds, vl);
                         if (rates == NULL)
                         {
-                                WARNING ("format_values: "
-						"uc_get_rate failed.");
+                                WARNING ("format_values: uc_get_rate failed.");
                                 return (-1);
                         }
-                        BUFFER_ADD (":%g", rates[i]);
+                        BUFFER_ADD (":"GAUGE_FORMAT, rates[i]);
                 }
                 else if (ds->ds[i].type == DS_TYPE_COUNTER)
                         BUFFER_ADD (":%llu", vl->values[i].counter);
@@ -989,7 +988,7 @@ int format_values (char *ret, size_t ret_len, /* {{{ */
                         BUFFER_ADD (":%"PRIu64, vl->values[i].absolute);
                 else
                 {
-                        ERROR ("format_values plugin: Unknown data source type: %i",
+                        ERROR ("format_values: Unknown data source type: %i",
                                         ds->ds[i].type);
                         sfree (rates);
                         return (-1);