display the name of chip in sensor preferences.

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

diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c
index c33dfb2..f12955c 100644 (file)
--- a/src/lib/lmsensor.c
+++ b/src/lib/lmsensor.c
@@ -39,8 +39,7 @@ static double get_value(const sensors_chip_name *name,
 
        err = sensors_get_value(name, sub->number, &val);
        if (err) {
-               fprintf(stderr,
-                       _("ERROR: Can't get value of subfeature %s: %s\n"),
+               log_err(_("lmsensor: cannot get value of subfeature %s: %s."),
                        sub->name, sensors_strerror(err));
                val = UNKNOWN_DBL_VALUE;
        }
@@ -105,9 +104,8 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
 {
        char name[200];
        const sensors_subfeature *sf;
-       char *label;
        int type;
-       char *id;
+       char *id, *label, *cname;
        struct psensor *psensor;
        sensors_subfeature_type fault_subfeature;
 
@@ -121,8 +119,8 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
                fault_subfeature = SENSORS_SUBFEATURE_FAN_FAULT;
 
        } else {
-               fprintf(stderr,
-                       _("ERROR: create_sensor, wrong feature type\n"));
+               log_err(_(
+"lmsensor: lmsensor_psensor_create failure: wrong feature type."));
                return NULL;
        }
 
@@ -146,7 +144,16 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
                    1);
        sprintf(id, "lmsensor %s %s", name, label);
 
-       psensor = psensor_create(id, label, type, values_max_length);
+       if (!strcmp(chip->prefix, "coretemp"))
+               cname = strdup("Intel CPU");
+       else if (!strcmp(chip->prefix, "k10temp"))
+               cname = strdup("AMD CPU");
+       else if (!strcmp(chip->prefix, "nouveau"))
+               cname = strdup("Nvidia GPU");
+       else
+               cname = strdup(chip->prefix);
+
+       psensor = psensor_create(id, label, cname, type, values_max_length);
 
        psensor->iname = chip;
        psensor->feature = feature;
@@ -204,8 +211,7 @@ void lmsensor_init()
        int err = sensors_init(NULL);
 
        if (err) {
-               fprintf(stderr,
-                       _("ERROR: lm-sensors initialization failure: %s\n"),
+               log_err(_("lmsensor: initialization failure: %s."),
                        sensors_strerror(err));
                init_done = 0;
        } else {