X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=efd63c085452f7ba238247e1caade93d4bb35ac0;hb=dd324a1592259913e6e92d3b54e6fa2b0c5f38f7;hp=161b4d67fc063d693b1f319e016687cea4ae639d;hpb=c27675331d874c85625d2e64ebcc229db588c5f2;p=collectd.git

diff --git a/src/common.c b/src/common.c
index 161b4d67..efd63c08 100644
--- a/src/common.c
+++ b/src/common.c
@@ -411,8 +411,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);
@@ -902,18 +902,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);
@@ -923,7 +922,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);
@@ -1061,9 +1060,9 @@ int parse_value (const char *value_orig, value_t *ret_value, int ds_type)
   }
 
   if (value == endptr) {
-    sfree (value);
     ERROR ("parse_value: Failed to parse string as %s: %s.",
         DS_TYPE_TO_STRING (ds_type), value);
+    sfree (value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))