From f7cb2fd74d5b485baa61349e4b7e57936372d29a Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Wed, 11 Sep 2013 08:47:31 +0100 Subject: [PATCH] Close a few file handles that have been left open unecessarily. --- src/input/mpegts/linuxdvb/linuxdvb_device.c | 6 ++++++ src/trap.c | 1 + 2 files changed, 7 insertions(+) diff --git a/src/input/mpegts/linuxdvb/linuxdvb_device.c b/src/input/mpegts/linuxdvb/linuxdvb_device.c index 9e288f0d..33fb990f 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_device.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_device.c @@ -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 diff --git a/src/trap.c b/src/trap.c index 6a81ba9c..42697906 100644 --- a/src/trap.c +++ b/src/trap.c @@ -254,6 +254,7 @@ trap_init(const char *ver) free(m); } } + close(fd); } snprintf(line1, sizeof(line1),