X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fonewire.c;h=d308122accc1f4953e4f2cb7e17daa943bd0157f;hb=3c11483706eebaac9650a4bf051dfd665ff8ed0f;hp=261457a1bb90cad631a236c8fc7014818b4f9c01;hpb=39016ac2ff4bd81c46fd03d16ff26f1866fbeb57;p=collectd.git diff --git a/src/onewire.c b/src/onewire.c index 261457a1..d308122a 100644 --- a/src/onewire.c +++ b/src/onewire.c @@ -89,9 +89,7 @@ static int cow_load_config (const char *key, const char *value) else if (strcasecmp (key, "IgnoreSelected") == 0) { ignorelist_set_invert (sensor_list, 1); - if ((strcasecmp (value, "True") == 0) - || (strcasecmp (value, "Yes") == 0) - || (strcasecmp (value, "On") == 0)) + if (IS_TRUE (value)) ignorelist_set_invert (sensor_list, 0); } else if (strcasecmp (key, "Device") == 0) @@ -108,10 +106,10 @@ static int cow_load_config (const char *key, const char *value) } else if (strcasecmp ("Interval", key) == 0) { - int tmp; - tmp = atoi (value); - if (tmp > 0) - ow_interval = tmp; + double tmp; + tmp = atof (value); + if (tmp > 0.0) + ow_interval = DOUBLE_TO_CDTIME_T (tmp); else ERROR ("onewire plugin: Invalid `Interval' setting: %s", value); } @@ -308,11 +306,9 @@ static int cow_init (void) return (1); } - memset (&cb_interval, 0, sizeof (cb_interval)); - if (ow_interval > 0) - cb_interval.tv_sec = (time_t) ow_interval; + CDTIME_T_TO_TIMESPEC (ow_interval, &cb_interval); - plugin_register_complex_read ("onewire", cow_read, + plugin_register_complex_read (/* group = */ NULL, "onewire", cow_read, &cb_interval, /* user data = */ NULL); plugin_register_shutdown ("onewire", cow_shutdown);