/*
- * 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
#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>
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;
}
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);
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);
}
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;
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);
while (c && (c = next_hdd_info(c, &info))) {
struct psensor *sensor;
struct psensor **tmp_sensors;
+ char *id = malloc(strlen("hddtemp ") + strlen(info.name) + 1);
- char *id = malloc(strlen("hdd ") + strlen(info.name) + 1);
- strcpy(id, "hdd ");
+ strcpy(id, "hddtemp ");
strcat(id, 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_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);
}
}
-void hdd_psensor_list_update(struct psensor **sensors)
+void hddtemp_psensor_list_update(struct psensor **sensors)
{
char *hddtemp_output = fetch();
return;
if (hddtemp_output[0] == '|') {
-
char *c = hddtemp_output;
struct hdd_info info;
+
info.name = NULL;
info.temp = 0;
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);