walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed leaking file handle on BeOS during CD-ROM detection.

This commit is contained in:
Ryan C. Gordon 2010-11-14 00:43:47 -05:00
parent 4d567a0d2f
commit 7d253b13ed
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform_beos.cpp
View File

@ -125,15 +125,16 @@ static void tryDir(const char *d, PHYSFS_StringCallback callback, void *data)
else else
{ {
bool add_it = false; bool add_it = false;
int devfd;
device_geometry g; device_geometry g;
if (strcmp(e.name, "raw") == 0) /* ignore partitions. */ if (strcmp(e.name, "raw") == 0) /* ignore partitions. */
{ {
int devfd = open(name, O_RDONLY); const int devfd = open(name, O_RDONLY);
if (devfd >= 0) if (devfd >= 0)
{ {
if (ioctl(devfd, B_GET_GEOMETRY, &g, sizeof(g)) >= 0) const int rc = ioctl(devfd, B_GET_GEOMETRY, &g, sizeof(g));
close(devfd);
if (rc >= 0)
{ {
if (g.device_type == B_CD) if (g.device_type == B_CD)
{ {
@ -147,8 +148,6 @@ static void tryDir(const char *d, PHYSFS_StringCallback callback, void *data)
} /* if */ } /* if */
} /* if */ } /* if */
} /* if */ } /* if */
close(devfd);
} /* else */ } /* else */
} /* while */ } /* while */
} /* tryDir */ } /* tryDir */