stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Close a few file handles that have been left open unecessarily.

Browse source
This commit is contained in:
Adam Sutton 2013-09-11 08:47:31 +01:00
parent 2a149671d6
commit f7cb2fd74d
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/mpegts/linuxdvb/linuxdvb_device.c
View file

@ -73,12 +73,14 @@ get_device_info ( device_info_t *di, int a )
if ((fp = fopen(path, "r"))) {
if (fscanf(fp, "0x%hx", &u16) == 1)
di->di_dev = u16;
fclose(fp);
}
di->di_dev <<= 16;
snprintf(path, sizeof(path), DVB_DEV_PATH "/subsystem_device", a);
if ((fp = fopen(path, "r"))) {
if (fscanf(fp, "0x%hx", &u16) == 1)
di->di_dev |= u16;
fclose(fp);
}
} else if (!strcmp(bus, "usb")) {
@ -87,12 +89,14 @@ get_device_info ( device_info_t *di, int a )
if ((fp = fopen(path, "r"))) {
if (fscanf(fp, "%hx", &u16) == 1)
di->di_dev = u16;
fclose(fp);
}
di->di_dev <<= 16;
snprintf(path, sizeof(path), DVB_DEV_PATH "/idProduct", a);
if ((fp = fopen(path, "r"))) {
if (fscanf(fp, "%hx", &u16) == 1)
di->di_dev |= u16;
fclose(fp);
}
snprintf(path, sizeof(path), DVB_DEV_PATH "/speed", a);
if ((fp = fopen(path, "r"))) {
@ -158,6 +162,7 @@ get_min_dvb_adapter ( device_info_t *di )
if ((sscanf(de->d_name, "dvb%d.frontend0", &t)))
if (mina == -1 || t < mina) mina = t;
}
closedir(dp);
}
di->di_min_adapter = mina;
}
@ -316,6 +321,7 @@ void linuxdvb_device_init ( int adapter_mask )
if ((0x1 << a) & adapter_mask)
linuxdvb_adapter_added(a);
}
closedir(dp);
}
// TODO: add udev support for hotplug

1
src/trap.c
View file

@ -254,6 +254,7 @@ trap_init(const char *ver)
free(m);
}
}
close(fd);
}
snprintf(line1, sizeof(line1),