diff options
author | deischen <deischen@FreeBSD.org> | 2002-08-29 23:06:07 +0000 |
---|---|---|
committer | deischen <deischen@FreeBSD.org> | 2002-08-29 23:06:07 +0000 |
commit | 8347fcb52dac051382b95182fce08ee0fc642340 (patch) | |
tree | 24c4da9130c487d85f113d7fdfa44a22f470cb61 /lib/libpthread/thread/thr_close.c | |
parent | 175524795910e8310c89ecf8adfddb91fc451e9e (diff) | |
download | FreeBSD-src-8347fcb52dac051382b95182fce08ee0fc642340.zip FreeBSD-src-8347fcb52dac051382b95182fce08ee0fc642340.tar.gz |
Remove much of the dereferencing of the fd table entries to look
at file flags and replace it with functions that will avoid null
pointer checks.
MFC to be done by archie ;-)
PR: 42100
Reviewed by: archie, robert
MFC after: 3 days
Diffstat (limited to 'lib/libpthread/thread/thr_close.c')
-rw-r--r-- | lib/libpthread/thread/thr_close.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libpthread/thread/thr_close.c b/lib/libpthread/thread/thr_close.c index 0a5bd24..22c9394 100644 --- a/lib/libpthread/thread/thr_close.c +++ b/lib/libpthread/thread/thr_close.c @@ -82,7 +82,8 @@ _close(int fd) * using, which would then cause any reads to block * indefinitely. */ - if ((S_ISREG(sb.st_mode) || S_ISCHR(sb.st_mode)) && (_thread_fd_table[fd]->flags & O_NONBLOCK) == 0) { + if ((S_ISREG(sb.st_mode) || S_ISCHR(sb.st_mode)) + && (_thread_fd_getflags(fd) & O_NONBLOCK) == 0) { /* Get the current flags: */ flags = __sys_fcntl(fd, F_GETFL, NULL); /* Clear the nonblocking file descriptor flag: */ |