X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=0e0479b58954ae89caf0c2a5ea51a470d33e9112;hb=60f6135a421095b240b984898e555df284f3b77f;hp=826aa47e8ede3e75eadd3b3e42a3545ef3083c0c;hpb=bb4e19d49b0d2f608b73e96e6c6d10daed6c161a;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 826aa47..0e0479b 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -23,6 +23,8 @@ #include #define _(str) gettext(str) +#include + #include #include #include @@ -155,32 +157,15 @@ int psensor_list_size(struct psensor **sensors) return size; } -int psensor_list_contains_type(struct psensor **sensors, unsigned int type) -{ - struct psensor **s; - - if (!sensors) - return 0; - - s = sensors; - while (*s) { - if ((*s)->type & type) - return 1; - s++; - } - - return 0; -} - struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor) { int size; + struct psensor **result; size = psensor_list_size(sensors); - struct psensor **result - = malloc((size + 1 + 1) * sizeof(struct psensor *)); + result = malloc((size + 1 + 1) * sizeof(struct psensor *)); if (sensors) memcpy(result, sensors, size * sizeof(struct psensor *)); @@ -474,17 +459,6 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius) return _("N/A"); } -void psensor_list_update_measures(struct psensor **sensors) -{ - if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP)) - hddtemp_psensor_list_update(sensors); - -#ifdef HAVE_ATASMART - if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART)) - atasmart_psensor_list_update(sensors); -#endif -} - void psensor_log_measures(struct psensor **sensors) { if (log_level == LOG_DEBUG) @@ -497,14 +471,6 @@ void psensor_log_measures(struct psensor **sensors) } } -void psensor_init() -{ -} - -void psensor_cleanup() -{ -} - struct psensor **psensor_list_copy(struct psensor **sensors) { struct psensor **result;