code style, cleanup, changed to bool return type

[psensor.git] / src / lib / psensor.c

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 826aa47..8f15edf 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -155,18 +155,15 @@ int psensor_list_size(struct psensor **sensors)
        return size;
 }
 
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
+bool 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)
+       while (*sensors) {
+               if ((*sensors)->type & type)
                        return 1;
-               s++;
+               sensors++;
        }
 
        return 0;
@@ -474,17 +471,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 +483,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;