Merge tag 'upstream/1.1.2'

[psensor-pkg-ubuntu.git] / src / lib / hdd_atasmart.c

diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c
index f3e6619..0fd7d5d 100644 (file)
--- a/src/lib/hdd_atasmart.c
+++ b/src/lib/hdd_atasmart.c
@@ -35,10 +35,12 @@
 #include <atasmart.h>
 #include <linux/fs.h>
 
-#include "pio.h"
-#include "hdd.h"
+#include <pio.h>
+#include <hdd.h>
 #include <plog.h>
 
+static const char *PROVIDER_NAME = "atasmart";
+
 static int filter_sd(const char *p)
 {
        return strlen(p) == 8 && !strncmp(p, "/dev/sd", 7);
@@ -72,43 +74,34 @@ static void analyze_disk(const char *dname)
        struct stat st;
        uint64_t size;
 
-       log_debug("analyze_disk(hdd_atasmart): %s", dname);
+       log_fct("Analyze %s", dname);
 
        f = open(dname, O_RDONLY|O_NOCTTY|O_NONBLOCK|O_CLOEXEC);
 
        if (f < 0) {
-               log_debug("analyze_disk(hdd_atasmart): Could not open file %s: %s",
-                         dname,
-                         strerror(errno));
+               log_fct("Could not open file %s: %s", dname, strerror(errno));
                goto fail;
        }
 
        if (fstat(f, &st) < 0) {
-               log_debug("analyze_disk(hdd_atasmart): fstat fails %s: %s",
-                         dname,
-                         strerror(errno));
+               log_fct("fstat fails %s: %s", dname, strerror(errno));
                goto fail;
        }
 
        if (!S_ISBLK(st.st_mode)) {
-               log_debug("analyze_disk(hdd_atasmart): !S_ISBLK fails %s",
-                         dname);
+               log_fct("!S_ISBLK fails %s", dname);
                goto fail;
        }
 
        size = (uint64_t)-1;
        /* So, it's a block device. Let's make sure the ioctls work */
        if (ioctl(f, BLKGETSIZE64, &size) < 0) {
-               log_debug("analyze_disk(hdd_atasmart): ioctl fails %s: %s",
-                         dname,
-                         strerror(errno));
+               log_fct("ioctl fails %s: %s", dname, strerror(errno));
                goto fail;
        }
 
        if (size <= 0 || size == (uint64_t) -1) {
-               log_debug("analyze_disk(hdd_atasmart): ioctl wrong size %s: %ld",
-                         dname,
-                         size);
+               log_fct("ioctl wrong size %s: %ld", dname, size);
                goto fail;
        }
 
@@ -116,40 +109,37 @@ static void analyze_disk(const char *dname)
        close(f);
 }
 
-struct psensor **hdd_psensor_list_add(struct psensor **sensors,
-                                     int values_max_length)
+void
+atasmart_psensor_list_append(struct psensor ***sensors, int values_max_length)
 {
        char **paths, **tmp, *id;
        SkDisk *disk;
-       struct psensor *sensor, **tmp_sensors, **result;
+       struct psensor *sensor;
 
-       log_debug("hdd_psensor_list_add(hdd_atasmart)");
+       log_fct_enter();
 
        paths = dir_list("/dev", filter_sd);
 
-       result = sensors;
        tmp = paths;
        while (*tmp) {
-               log_debug("hdd_psensor_list_add(hdd_atasmart) open %s", *tmp);
+               log_fct("Open %s", *tmp);
 
                if (!sk_disk_open(*tmp, &disk)) {
-                       id = malloc(strlen("hdd at") + strlen(*tmp) + 1);
-                       strcpy(id, "hdd at");
-                       strcat(id, *tmp);
+                       id = malloc(strlen(PROVIDER_NAME)
+                                   + 1
+                                   + strlen(*tmp)
+                                   + 1);
+                       sprintf(id, "%s %s", PROVIDER_NAME, *tmp);
 
                        sensor = create_sensor(id,
                                               *tmp,
                                               disk,
                                               values_max_length);
 
-                       tmp_sensors = psensor_list_add(result, sensor);
-
-                       if (result != sensors)
-                               free(result);
-
-                       result = tmp_sensors;
+                       psensor_list_append(sensors, sensor);
                } else {
-                       log_err(_("atasmart: sk_disk_open() failure: %s."),
+                       log_err(_("%s: sk_disk_open() failure: %s."),
+                               PROVIDER_NAME,
                                *tmp);
                        analyze_disk(*tmp);
                }
@@ -159,10 +149,10 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 
        paths_free(paths);
 
-       return result;
+       log_fct_exit();
 }
 
-void hdd_psensor_list_update(struct psensor **sensors)
+void atasmart_psensor_list_update(struct psensor **sensors)
 {
        struct psensor **cur, *s;
        uint64_t kelvin;
@@ -183,9 +173,7 @@ void hdd_psensor_list_update(struct psensor **sensors)
                                if (!ret) {
                                        c = (kelvin - 273150) / 1000;
                                        psensor_set_current_value(s, c);
-                                       log_debug("hdd_psensor_list_update(hdd_atasmart): %s %.2f",
-                                                 s->id,
-                                                 c);
+                                       log_fct("%s %.2f", s->id, c);
                                }
                        }
                }