some small leaks in tempget

SVN revision: 80876
This commit is contained in:
Mike Blumenkrantz 2012-12-13 14:59:50 +00:00
parent 8f0efbf740
commit d2058ecbad
1 changed files with 4 additions and 7 deletions

View File

@ -100,9 +100,8 @@ init(void)
if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0))) if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0)))
{ {
if (sensor_name) free(sensor_name); E_FREE(sensor_name);
if (sensor_path) free(sensor_path); E_FREE(sensor_path);
sensor_path = NULL;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
/* TODO: FreeBSD can also have more temperature sensors! */ /* TODO: FreeBSD can also have more temperature sensors! */
sensor_type = SENSOR_TYPE_FREEBSD; sensor_type = SENSOR_TYPE_FREEBSD;
@ -244,6 +243,7 @@ init(void)
if (len > 6) path[len - 6] = '\0'; if (len > 6) path[len - 6] = '\0';
sensor_type = SENSOR_TYPE_LINUX_PCI; sensor_type = SENSOR_TYPE_LINUX_PCI;
sensor_path = strdup(name); sensor_path = strdup(name);
free(sensor_name);
sensor_name = strdup(path); sensor_name = strdup(path);
printf("sensor type = pci\n" printf("sensor type = pci\n"
"sensor path = %s\n" "sensor path = %s\n"
@ -605,10 +605,7 @@ main(int argc, char *argv[])
sensor_type = atoi(argv[1]); sensor_type = atoi(argv[1]);
sensor_name = strdup(argv[2]); sensor_name = strdup(argv[2]);
if (!strcmp(sensor_name, "-null-")) if (!strcmp(sensor_name, "-null-"))
{ E_FREE(sensor_name);
free(sensor_name);
sensor_name = NULL;
}
poll_interval = atoi(argv[3]); poll_interval = atoi(argv[3]);
cur_poll_interval = poll_interval; cur_poll_interval = poll_interval;