X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhdd_hddtemp.c;h=2182691b70700704e276168b61df5410abf43588;hb=6377786611071cc52571504e1b9db8091e90a6f8;hp=a511839adfdf41d2763feae19d086b8c630fd03f;hpb=f606bd3f16446091d0b88255a497a64e3f623aa3;p=psensor.git

diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c
index a511839..2182691 100644
--- 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
@@ -21,9 +21,9 @@
 #define _(str) gettext(str)
 
 /*
-  Following code is based on GNOME sensors applet code hddtemp-plugin.c
-  see http://sensors-applet.sourceforge.net/
-*/
+ * 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 +33,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 +58,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(_("hddtemp: failed to open socket."));
 		return NULL;
 	}
 
@@ -69,8 +71,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(_("hddtemp: failed to open connection."));
 	} else {
 		buffer = malloc(HDDTEMP_OUTPUT_BUFFER_LENGTH);
 
@@ -116,7 +117,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_HDDTEMP,
+	int t;
+
+	t = SENSOR_TYPE_HDD | SENSOR_TYPE_HDDTEMP | SENSOR_TYPE_TEMP;
+
+	return psensor_create(id, name, strdup(_("Disk")),
+			      t,
 			      values_max_length);
 }
 
@@ -167,20 +173,20 @@ 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)
+struct psensor **hddtemp_psensor_list_add(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;
 
 	if (hddtemp_output[0] != '|') {
-		fprintf(stderr,
-			_("ERROR: wrong hdd string: %s"), hddtemp_output);
+		log_err(_("hddtemp: wrong string: %s."), hddtemp_output);
 
 		free(hddtemp_output);
 
@@ -194,10 +200,10 @@ struct psensor **hdd_psensor_list_add(struct psensor **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);
 
@@ -219,8 +225,9 @@ 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_HDDTEMP
-		    && !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);
 
@@ -228,17 +235,19 @@ static void update(struct psensor **sensors, struct hdd_info *info)
 	}
 }
 
-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 +258,7 @@ void hdd_psensor_list_update(struct psensor **sensors)
 			free(info.name);
 		}
 	} else {
-		fprintf(stderr,
-			_("ERROR: wrong hdd string: %s\n"), hddtemp_output);
+		log_err(_("hddtemp: wrong string: %s."), hddtemp_output);
 	}
 
 	free(hddtemp_output);