X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhdd_hddtemp.c;h=5c89a1fb9b28498ee5cc1982679777f493b337f5;hb=c954b9289560c0f20dc364f15994499646e24528;hp=5c50a5c81629e00d098e795e4168294078f6c2e1;hpb=b028afb4f41b141ee26e113b8b27f0d086dc8e1e;p=psensor.git

diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c
index 5c50a5c..5c89a1f 100644
--- a/src/lib/hdd_hddtemp.c
+++ b/src/lib/hdd_hddtemp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 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
@@ -33,8 +33,10 @@
 #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
@@ -119,7 +121,7 @@ create_sensor(char *id, char *name, int values_max_length)
 
 	t = SENSOR_TYPE_HDD | SENSOR_TYPE_HDDTEMP | SENSOR_TYPE_TEMP;
 
-	return psensor_create(id, name, strdup("HDD"),
+	return psensor_create(id, name, strdup(_("Disk")),
 			      t,
 			      values_max_length);
 }
@@ -197,10 +199,10 @@ struct psensor **hddtemp_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);
 
@@ -222,8 +224,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_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);
 
@@ -233,15 +236,17 @@ static void update(struct psensor **sensors, struct hdd_info *info)
 
 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;