diff --git a/src/common.c b/src/common.c
index 4ca58d5527b103e07f110300b273dacac153be3f..b679bf70f4ccff6a385c47b5fb4f47ccbd26a8b1 100644 (file)
--- a/src/common.c
+++ b/src/common.c
{
if (errno == ENOENT)
{
- if (mkdir (dir, 0755) == 0)
+ if (mkdir (dir, S_IRWXU | S_IRWXG | S_IRWXO) == 0)
break;
/* this might happen, if a different thread created
kstat_named_t *kn;
long long retval = -1LL;
-#ifdef assert
- assert (ksp != NULL);
- assert (ksp->ks_type == KSTAT_TYPE_NAMED);
-#else
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)
{
- 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);
}
-#endif
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;
rate_to_value_state_t *state,
int ds_type, cdtime_t t)
{
- derive_t delta_gauge;
+ gauge_t delta_gauge;
cdtime_t delta_t;
if (ds_type == DS_TYPE_GAUGE)
assert (23 == 42);
}
+ state->last_time = t;
*ret_value = state->last_value;
return (0);
} /* }}} value_t rate_to_value */