projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use kern.cp_times sysctl for FreeBSD smp support
[collectd.git]
/
src
/
utils_db_query.c
diff --git
a/src/utils_db_query.c
b/src/utils_db_query.c
index
5531b25
..
5f892a4
100644
(file)
--- a/
src/utils_db_query.c
+++ b/
src/utils_db_query.c
@@
-207,11
+207,11
@@
static int udb_legacy_result_handle_result (udb_result_t *r, /* {{{ */
vl.values_len = 1;
value_str = column_values[r->legacy_position];
vl.values_len = 1;
value_str = column_values[r->legacy_position];
- if (0 != parse_value (value_str, &vl.values[0], r->ds->ds[0]))
+ if (0 != parse_value (value_str, &vl.values[0], r->ds->ds[0]
.type
))
{
ERROR ("db query utils: udb_legacy_result_handle_result: "
"Parsing `%s' as %s failed.", value_str,
{
ERROR ("db query utils: udb_legacy_result_handle_result: "
"Parsing `%s' as %s failed.", value_str,
-
(r->ds->ds[0].type == DS_TYPE_COUNTER) ? "counter" : "gauge"
);
+
DS_TYPE_TO_STRING (r->ds->ds[0].type)
);
errno = EINVAL;
return (-1);
}
errno = EINVAL;
return (-1);
}
@@
-364,11
+364,10
@@
static int udb_result_submit (udb_result_t *r, udb_query_t *q) /* {{{ */
{
char *value_str = r->values_buffer[i];
{
char *value_str = r->values_buffer[i];
- if (0 != parse_value (value_str, &vl.values[i], r->ds->ds[i]))
+ if (0 != parse_value (value_str, &vl.values[i], r->ds->ds[i]
.type
))
{
ERROR ("db query utils: udb_result_submit: Parsing `%s' as %s failed.",
{
ERROR ("db query utils: udb_result_submit: Parsing `%s' as %s failed.",
- value_str,
- (r->ds->ds[i].type == DS_TYPE_COUNTER) ? "counter" : "gauge");
+ value_str, DS_TYPE_TO_STRING (r->ds->ds[i].type));
errno = EINVAL;
return (-1);
}
errno = EINVAL;
return (-1);
}