normalize logging

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

diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c
index fc408ae..7d70b4a 100644 (file)
--- a/src/lib/hdd_hddtemp.c
+++ b/src/lib/hdd_hddtemp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -16,14 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+
+/* Part of the code in this file is based on GNOME sensors applet code
+ * hddtemp-plugin.c see http://sensors-applet.sourceforge.net/
+ */
+
 #include <locale.h>
 #include <libintl.h>
 #define _(str) gettext(str)
 
-/*
-  Following code is based on GNOME sensors applet code hddtemp-plugin.c
-  see http://sensors-applet.sourceforge.net/
-*/
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -33,12 +34,14 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-#include "hdd.h"
-#include "psensor.h"
+#include <hdd.h>
+#include <psensor.h>
+
+static const char *PROVIDER_NAME = "hddtemp";
 
-#define HDDTEMP_SERVER_IP_ADDRESS "127.0.0.1"
-#define HDDTEMP_PORT_NUMBER 7634
-#define HDDTEMP_OUTPUT_BUFFER_LENGTH 4048
+static const char *HDDTEMP_SERVER_IP_ADDRESS = "127.0.0.1";
+static const int HDDTEMP_PORT_NUMBER = 7634;
+static const int HDDTEMP_OUTPUT_BUFFER_LENGTH = 4048;
 
 struct hdd_info {
        char *name;
@@ -56,7 +59,7 @@ static char *fetch()
 
        sockfd = socket(AF_INET, SOCK_STREAM, 0);
        if (sockfd == -1) {
-               fprintf(stderr, _("ERROR: hdd fetch, failed to open socket\n"));
+               log_err(_("%s: failed to open socket."), PROVIDER_NAME);
                return NULL;
        }
 
@@ -69,8 +72,7 @@ static char *fetch()
        if (connect(sockfd,
                    (struct sockaddr *)&address,
                    (socklen_t) sizeof(address)) == -1) {
-               fprintf(stderr,
-                       _("ERROR: hdd fetch, failed to open connection\n"));
+               log_err(_("%s: failed to open connection."), PROVIDER_NAME);
        } else {
                buffer = malloc(HDDTEMP_OUTPUT_BUFFER_LENGTH);
 
@@ -116,7 +118,12 @@ static int str_index(char *str, char d)
 static struct psensor *
 create_sensor(char *id, char *name, int values_max_length)
 {
-       return psensor_create(id, name, SENSOR_TYPE_HDD_TEMP,
+       int t;
+
+       t = SENSOR_TYPE_HDD | SENSOR_TYPE_HDDTEMP | SENSOR_TYPE_TEMP;
+
+       return psensor_create(id, name, strdup(_("Disk")),
+                             t,
                              values_max_length);
 }
 
@@ -167,51 +174,42 @@ static char *next_hdd_info(char *string, struct hdd_info *info)
        return c;
 }
 
-struct psensor **hdd_psensor_list_add(struct psensor **sensors,
-                                     int values_max_length)
+void
+hddtemp_psensor_list_append(struct psensor ***sensors, int values_max_length)
 {
-       char *hddtemp_output = fetch();
-       char *c;
+       char *hddtemp_output, *c;
        struct hdd_info info;
-       struct psensor **result;
+
+       hddtemp_output = fetch();
 
        if (!hddtemp_output)
-               return sensors;
+               return;
 
        if (hddtemp_output[0] != '|') {
-               fprintf(stderr,
-                       _("ERROR: wrong hdd string: %s"), hddtemp_output);
+               log_err(_("%s: wrong string: %s."),
+                       PROVIDER_NAME,
+                       hddtemp_output);
 
                free(hddtemp_output);
 
-               return sensors;
+               return;
        }
 
        c = hddtemp_output;
 
-       result = sensors;
-
        while (c && (c = next_hdd_info(c, &info))) {
                struct psensor *sensor;
-               struct psensor **tmp_sensors;
+               char *id;
 
-               char *id = malloc(strlen("hdd ") + strlen(info.name) + 1);
-               strcpy(id, "hdd ");
-               strcat(id, info.name);
+               id = malloc(strlen(PROVIDER_NAME) + 1 + strlen(info.name) + 1);
+               sprintf(id, "%s %s", PROVIDER_NAME, info.name);
 
                sensor = create_sensor(id, info.name, values_max_length);
 
-               tmp_sensors = psensor_list_add(result, sensor);
-
-               if (result != sensors)
-                       free(result);
-
-               result = tmp_sensors;
+               psensor_list_append(sensors, sensor);
        }
 
        free(hddtemp_output);
-
-       return result;
 }
 
 static void update(struct psensor **sensors, struct hdd_info *info)
@@ -219,26 +217,29 @@ static void update(struct psensor **sensors, struct hdd_info *info)
        struct psensor **sensor_cur = sensors;
 
        while (*sensor_cur) {
-               if ((*sensor_cur)->type == SENSOR_TYPE_HDD_TEMP
-                   && !strcmp((*sensor_cur)->id + 4, info->name))
+               if (!((*sensor_cur)->type & SENSOR_TYPE_REMOTE)
+                   && (*sensor_cur)->type & SENSOR_TYPE_HDDTEMP
+                   && !strcmp((*sensor_cur)->id + 8, info->name))
                        psensor_set_current_value(*sensor_cur,
-                                                 (float)info->temp);
+                                                 (double)info->temp);
 
                sensor_cur++;
        }
 }
 
-void hdd_psensor_list_update(struct psensor **sensors)
+void hddtemp_psensor_list_update(struct psensor **sensors)
 {
-       char *hddtemp_output = fetch();
+       char *hddtemp_output;
+
+       hddtemp_output = fetch();
 
        if (!hddtemp_output)
                return;
 
        if (hddtemp_output[0] == '|') {
-
                char *c = hddtemp_output;
                struct hdd_info info;
+
                info.name = NULL;
                info.temp = 0;
 
@@ -249,8 +250,9 @@ void hdd_psensor_list_update(struct psensor **sensors)
                        free(info.name);
                }
        } else {
-               fprintf(stderr,
-                       _("ERROR: wrong hdd string: %s\n"), hddtemp_output);
+               log_err(_("%s: wrong string: %s."),
+                       PROVIDER_NAME,
+                       hddtemp_output);
        }
 
        free(hddtemp_output);