projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.3' into collectd-5.4
[collectd.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index
161b4d6
..
8a40792
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);
@@
-1061,9
+1061,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))