X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=c8dc6a9b5ce89e97d08227254025ddde11f11418;hb=138f4d6a450e4ead5da85fdef006e48e906223d8;hp=826aa47e8ede3e75eadd3b3e42a3545ef3083c0c;hpb=bb4e19d49b0d2f608b73e96e6c6d10daed6c161a;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 826aa47..c8dc6a9 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -23,6 +23,8 @@ #include #define _(str) gettext(str) +#include + #include #include #include @@ -61,7 +63,6 @@ struct psensor *psensor_create(char *id, psensor->color = NULL; psensor->graph_enabled = 1; - psensor->appindicator_enabled = 0; psensor->provider_data = NULL; psensor->provider_data_free_fct = &free; @@ -155,32 +156,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 +458,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 +470,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;