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-4.10' into collectd-5.0
[collectd.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index
406482a
..
0bd9f68
100644
(file)
--- a/
src/common.c
+++ b/
src/common.c
@@
-636,24
+636,23
@@
long long get_kstat_value (kstat_t *ksp, char *name)
kstat_named_t *kn;
long long retval = -1LL;
kstat_named_t *kn;
long long retval = -1LL;
-#ifdef assert
- assert (ksp != NULL);
- assert (ksp->ks_type == KSTAT_TYPE_NAMED);
-#else
if (ksp == NULL)
{
if (ksp == NULL)
{
- ERROR ("
ERROR: %s:%i: ksp == NULL\n", __FILE__, __LINE__
);
+ ERROR ("
get_kstat_value (\"%s\"): ksp is NULL.", name
);
return (-1LL);
}
else if (ksp->ks_type != KSTAT_TYPE_NAMED)
{
return (-1LL);
}
else if (ksp->ks_type != KSTAT_TYPE_NAMED)
{
- ERROR ("ERROR: %s:%i: ksp->ks_type != KSTAT_TYPE_NAMED\n", __FILE__, __LINE__);
+ ERROR ("get_kstat_value (\"%s\"): ksp->ks_type (%#x) "
+ "is not KSTAT_TYPE_NAMED (%#x).",
+ name,
+ (unsigned int) ksp->ks_type,
+ (unsigned int) KSTAT_TYPE_NAMED);
return (-1LL);
}
return (-1LL);
}
-#endif
if ((kn = (kstat_named_t *) kstat_data_lookup (ksp, name)) == NULL)
if ((kn = (kstat_named_t *) kstat_data_lookup (ksp, name)) == NULL)
- return (
retval
);
+ return (
-1LL
);
if (kn->data_type == KSTAT_DATA_INT32)
retval = (long long) kn->value.i32;
if (kn->data_type == KSTAT_DATA_INT32)
retval = (long long) kn->value.i32;