From d038753c8b281125b698d6056ddbb78cf104c5d2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 22 Sep 2014 09:10:12 +0200 Subject: [PATCH] cleanup and style --- src/lib/hdd_hddtemp.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c index 91ef103..39c00c6 100644 --- a/src/lib/hdd_hddtemp.c +++ b/src/lib/hdd_hddtemp.c @@ -50,13 +50,13 @@ struct hdd_info { static char *fetch() { - 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(_("%s: failed to open socket."), PROVIDER_NAME); @@ -177,8 +177,9 @@ static char *next_hdd_info(char *string, struct hdd_info *info) 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 *sensor; hddtemp_output = fetch(); @@ -198,9 +199,6 @@ hddtemp_psensor_list_append(struct psensor ***sensors, int values_max_length) c = hddtemp_output; while (c && (c = next_hdd_info(c, &info))) { - struct psensor *sensor; - char *id; - id = malloc(strlen(PROVIDER_NAME) + 1 + strlen(info.name) + 1); sprintf(id, "%s %s", PROVIDER_NAME, info.name); -- 2.7.4