enable/disable of lmsensor provider
[psensor.git] / src / lib / lmsensor.c
index 99ce552..cf9f0be 100644 (file)
@@ -48,17 +48,18 @@ static double get_value(const sensors_chip_name *name,
 
 static double get_temp_input(struct psensor *sensor)
 {
+       const sensors_subfeature *sf;
+
        const sensors_chip_name *chip = sensor->iname;
-       const sensors_feature *feature = sensor->feature;
 
-       const sensors_subfeature *sf;
+       const sensors_feature *feature = sensor->feature;
 
        sf = sensors_get_subfeature(chip,
                                    feature, SENSORS_SUBFEATURE_TEMP_INPUT);
        if (sf)
                return get_value(chip, sf);
-       else
-               return UNKNOWN_DBL_VALUE;
+
+       return UNKNOWN_DBL_VALUE;
 }
 
 static double get_fan_input(struct psensor *sensor)
@@ -72,8 +73,8 @@ static double get_fan_input(struct psensor *sensor)
                                    feature, SENSORS_SUBFEATURE_FAN_INPUT);
        if (sf)
                return get_value(chip, sf);
-       else
-               return UNKNOWN_DBL_VALUE;
+
+       return UNKNOWN_DBL_VALUE;
 }
 
 void lmsensor_psensor_list_update(struct psensor **sensors)
@@ -81,7 +82,7 @@ void lmsensor_psensor_list_update(struct psensor **sensors)
        struct psensor **s_ptr = sensors;
 
        if (!init_done)
-               return ;
+               return;
 
        while (*s_ptr) {
                struct psensor *s = *s_ptr;
@@ -145,15 +146,17 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
        sprintf(id, "lmsensor %s %s", name, label);
 
        if (!strcmp(chip->prefix, "coretemp"))
-               cname = strdup("Intel CPU");
+               cname = strdup(_("Intel CPU"));
        else if (!strcmp(chip->prefix, "k10temp")
                 || !strcmp(chip->prefix, "k8temp")
                 || !strcmp(chip->prefix, "fam15h_power"))
-               cname = strdup("AMD CPU");
+               cname = strdup(_("AMD CPU"));
        else if (!strcmp(chip->prefix, "nouveau"))
-               cname = strdup("Nvidia GPU");
+               cname = strdup(_("NVIDIA GPU"));
        else if (!strcmp(chip->prefix, "via-cputemp"))
-               cname = strdup("VIA CPU");
+               cname = strdup(_("VIA CPU"));
+       else if (!strcmp(chip->prefix, "acpitz"))
+               cname = strdup(_("ACPI"));
        else
                cname = strdup(chip->prefix);
 
@@ -171,56 +174,47 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
        return psensor;
 }
 
-struct psensor **lmsensor_psensor_list_add(struct psensor **sensors,
-                                          int vn)
+void lmsensor_init()
+{
+       int err = sensors_init(NULL);
+
+       if (err) {
+               log_err(_("lmsensor: initialization failure: %s."),
+                       sensors_strerror(err));
+               init_done = 0;
+       } else {
+               init_done = 1;
+       }
+}
+
+void lmsensor_psensor_list_append(struct psensor ***sensors, int vn)
 {
        const sensors_chip_name *chip;
        int chip_nr = 0;
-       struct psensor **tmp, **result;
        const sensors_feature *feature;
        struct psensor *s;
        int i;
 
        if (!init_done)
-               return NULL;
+               lmsensor_init();
+
+       if (!init_done)
+               return;
 
-       result = sensors;
        while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
 
                i = 0;
                while ((feature = sensors_get_features(chip, &i))) {
-
                        if (feature->type == SENSORS_FEATURE_TEMP
                            || feature->type == SENSORS_FEATURE_FAN) {
 
                                s = lmsensor_psensor_create(chip, feature, vn);
 
-                               if (s) {
-                                       tmp = psensor_list_add(result, s);
-
-                                       if (tmp != sensors)
-                                               free(result);
-
-                                       result = tmp;
-                               }
+                               if (s)
+                                       psensor_list_append(sensors, s);
                        }
                }
        }
-
-       return result;
-}
-
-void lmsensor_init()
-{
-       int err = sensors_init(NULL);
-
-       if (err) {
-               log_err(_("lmsensor: initialization failure: %s."),
-                       sensors_strerror(err));
-               init_done = 0;
-       } else {
-               init_done = 1;
-       }
 }
 
 void lmsensor_cleanup()