X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fonewire.c;h=3c441ecb3493791d4d650b7667f3d355ccdf9109;hb=5c2993e4121feae745551be182221b31bc23ff97;hp=51e6407137b0f2c8bc64598f822cac804c5a9fab;hpb=6d13532642c934667697842e4ff021e070ddf34d;p=collectd.git diff --git a/src/onewire.c b/src/onewire.c index 51e64071..3c441ecb 100644 --- a/src/onewire.c +++ b/src/onewire.c @@ -415,11 +415,11 @@ static int cow_read_ds2409 (const char *path) int status; status = ssnprintf (subpath, sizeof (subpath), "%s/main", path); - if ((status > 0) && (status < sizeof (subpath))) + if ((status > 0) && (status < (int) sizeof (subpath))) cow_read_bus (subpath); status = ssnprintf (subpath, sizeof (subpath), "%s/aux", path); - if ((status > 0) && (status < sizeof (subpath))) + if ((status > 0) && (status < (int) sizeof (subpath))) cow_read_bus (subpath); return (0); @@ -459,7 +459,7 @@ static int cow_read_bus (const char *path) else status = ssnprintf (subpath, sizeof (subpath), "%s/%s", path, buffer_ptr); - if ((status <= 0) || (status >= sizeof (subpath))) + if ((status <= 0) || (status >= (int) sizeof (subpath))) continue; for (i = 0; i < ow_family_features_num; i++) @@ -590,7 +590,6 @@ static int cow_shutdown (void) static int cow_init (void) { int status; - struct timespec cb_interval; if (device_g == NULL) { @@ -606,11 +605,8 @@ static int cow_init (void) return (1); } - CDTIME_T_TO_TIMESPEC (ow_interval, &cb_interval); - plugin_register_complex_read (/* group = */ NULL, "onewire", cow_read, - (ow_interval != 0) ? &cb_interval : NULL, - /* user data = */ NULL); + ow_interval, /* user data = */ NULL); plugin_register_shutdown ("onewire", cow_shutdown); return (0);