/*
- * 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
#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
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);
}
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);
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);
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;