X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=d019886e940a14856494d1261dbb0cc59506e5d7;hb=472cac625c92e0d5e0e2511e272e216489936490;hp=b9da81df9305ff23e5472f1e24d6b7db39f33a02;hpb=d019b476f28501c1f180d662fae0ca279e57e719;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index b9da81d..d019886 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -23,6 +23,8 @@
 #include <libintl.h>
 #define _(str) gettext(str)
 
+#include <stdio.h>
+
 #include <hdd.h>
 #include <psensor.h>
 #include <temperature.h>
@@ -48,7 +50,6 @@ struct psensor *psensor_create(char *id,
 	psensor->values_max_length = values_max_length;
 	psensor->measures = measures_dbl_create(values_max_length);
 
-	psensor->alarm_enabled = 0;
 	psensor->alarm_high_threshold = 0;
 	psensor->alarm_low_threshold = 0;
 
@@ -56,13 +57,8 @@ struct psensor *psensor_create(char *id,
 	psensor->cb_alarm_raised_data = NULL;
 	psensor->alarm_raised = 0;
 
-	psensor->url = NULL;
-
 	psensor->color = NULL;
 
-	psensor->graph_enabled = 1;
-	psensor->appindicator_enabled = 0;
-
 	psensor->provider_data = NULL;
 	psensor->provider_data_free_fct = &free;
 
@@ -110,8 +106,6 @@ void psensor_free(struct psensor *s)
 
 	measures_free(s->measures);
 
-	free(s->url);
-
 	if (s->provider_data && s->provider_data_free_fct)
 		s->provider_data_free_fct(s->provider_data);
 
@@ -159,11 +153,11 @@ 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 *));
@@ -264,15 +258,13 @@ void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv)
 	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
 		s->max = v;
 
-	if (s->alarm_enabled) {
-		if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
-			if (!s->alarm_raised && s->cb_alarm_raised)
-				s->cb_alarm_raised(s, s->cb_alarm_raised_data);
-
-			s->alarm_raised = 1;
-		} else {
-			s->alarm_raised = 0;
+	if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
+		if (!s->alarm_raised && s->cb_alarm_raised) {
+			s->alarm_raised = true;
+			s->cb_alarm_raised(s, s->cb_alarm_raised_data);
 		}
+	} else {
+		s->alarm_raised = false;
 	}
 }
 
@@ -350,28 +342,6 @@ double get_max_value(struct psensor **sensors, int type)
 	return m;
 }
 
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s_cur = sensors;
-
-	while (*s_cur) {
-		struct psensor *s = *s_cur;
-
-		if (s->graph_enabled && (s->type & type)) {
-			double v = psensor_get_current_value(s);
-
-			if (m == UNKNOWN_DBL_VALUE || v > m)
-				m = v;
-		}
-
-		s_cur++;
-	}
-
-	return m;
-}
-
 double get_min_temp(struct psensor **sensors)
 {
 	return get_min_value(sensors, SENSOR_TYPE_TEMP);
@@ -490,26 +460,3 @@ psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius)
 				    psensor_get_current_value(s),
 				    use_celsius);
 }
-
-struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors)
-{
-	int n, i;
-	struct psensor **result, **cur, *s;
-
-	if (!sensors)
-		return NULL;
-
-	n = psensor_list_size(sensors);
-	result = malloc((n+1) * sizeof(struct psensor *));
-
-	for (cur = sensors, i = 0; *cur; cur++) {
-		s = *cur;
-
-		if (s->graph_enabled)
-			result[i++] = s;
-	}
-
-	result[i] = NULL;
-
-	return result;
-}