fixed cpu load when fahrenheit is enabled.

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

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index abacd9f..4c3ad5c 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -32,14 +32,18 @@
 #endif
 
 
-struct psensor *psensor_create(char *id, char *name,
-                              unsigned int type, int values_max_length)
+struct psensor *psensor_create(char *id,
+                              char *name,
+                              char *chip,
+                              unsigned int type,
+                              int values_max_length)
 {
        struct psensor *psensor
            = (struct psensor *)malloc(sizeof(struct psensor));
 
        psensor->id = id;
        psensor->name = name;
+       psensor->chip = chip;
        psensor->enabled = 1;
        psensor->min = UNKNOWN_DBL_VALUE;
        psensor->max = UNKNOWN_DBL_VALUE;
@@ -96,6 +100,9 @@ void psensor_free(struct psensor *sensor)
                free(sensor->name);
                free(sensor->id);
 
+               if (sensor->chip)
+                       free(sensor->chip);
+
                if (sensor->color)
                        free(sensor->color);
 
@@ -226,6 +233,9 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius)
 
        unit = psensor_type_to_unit_str(type, use_celcius);
 
+       if (is_temp_type(type) && !use_celcius)
+               value = celcius_to_fahrenheit(value);
+
        sprintf(str, "%.0f%s", value, unit);
 
        return str;
@@ -395,7 +405,7 @@ double get_max_temp(struct psensor **sensors)
 
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 {
-       struct psensor **psensors = NULL;
+       struct psensor **psensors;
        struct psensor **tmp_psensors;
 
        psensors = lmsensor_psensor_list_add(NULL, values_max_length);