int temp;
};
-static char *fetch()
+static char *fetch(void)
{
- int sockfd;
+ int sockfd, output_length;
ssize_t n = 1;
- int output_length = 0;
- char *pc;
- char *buffer;
+ char *pc, *buffer;
struct sockaddr_in address;
+ output_length = 0;
+
sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd == -1) {
- log_err(_("hddtemp: failed to open socket."));
+ log_err(_("%s: failed to open socket."), PROVIDER_NAME);
return NULL;
}
if (connect(sockfd,
(struct sockaddr *)&address,
(socklen_t) sizeof(address)) == -1) {
- log_err(_("hddtemp: failed to open connection."));
+ log_err(_("%s: failed to open connection."), PROVIDER_NAME);
} else {
buffer = malloc(HDDTEMP_OUTPUT_BUFFER_LENGTH);
return c;
}
-struct psensor **hddtemp_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, *c;
+ char *hddtemp_output, *c, *id;
struct hdd_info info;
- struct psensor **result;
+ struct psensor *sensor;
hddtemp_output = fetch();
if (!hddtemp_output)
- return sensors;
+ return;
if (hddtemp_output[0] != '|') {
- log_err(_("hddtemp: wrong 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;
-
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)
{
- struct psensor **sensor_cur = sensors;
+ while (*sensors) {
+ if (!((*sensors)->type & SENSOR_TYPE_REMOTE)
+ && (*sensors)->type & SENSOR_TYPE_HDDTEMP
+ && !strcmp((*sensors)->id + 8, info->name))
+ psensor_set_current_value(*sensors,
+ (double)info->temp);
+
+ sensors++;
+ }
+}
+
+static bool contains_hddtemp_sensor(struct psensor **sensors)
+{
+ struct psensor *s;
- while (*sensor_cur) {
- 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);
+ if (!sensors)
+ return false;
- sensor_cur++;
+ while (*sensors) {
+ s = *sensors;
+ if (!(s->type & SENSOR_TYPE_REMOTE)
+ && (s->type & SENSOR_TYPE_HDDTEMP))
+ return true;
+ sensors++;
}
+
+ return false;
}
void hddtemp_psensor_list_update(struct psensor **sensors)
{
char *hddtemp_output;
+ if (!contains_hddtemp_sensor(sensors))
+ return;
+
hddtemp_output = fetch();
if (!hddtemp_output)
free(info.name);
}
} else {
- log_err(_("hddtemp: wrong string: %s."), hddtemp_output);
+ log_err(_("%s: wrong string: %s."),
+ PROVIDER_NAME,
+ hddtemp_output);
}
free(hddtemp_output);