projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network plugin: Avoid "status may be used uninitialized" warning.
[collectd.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index
161b4d6
..
efd63c0
100644
(file)
--- 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;
if ((buffer[buffer_len - 1] != '\n')
&& (buffer[buffer_len - 1] != '\r'))
break;
- buffer[buffer_len] = 0;
buffer_len--;
buffer_len--;
+ buffer[buffer_len] = 0;
}
return (buffer_len);
}
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)
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)
{
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);
}
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);
}
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
{
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);
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) {
}
if (value == endptr) {
- sfree (value);
ERROR ("parse_value: Failed to parse string as %s: %s.",
DS_TYPE_TO_STRING (ds_type), 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))
return -1;
}
else if ((NULL != endptr) && ('\0' != *endptr))