From cca44008d81209e9fa992157637d9de0384e0536 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 10 Dec 1998 23:31:54 +0000 Subject: Merged Eric Norum's select patch that was based on 4.0 and resolved all conflicts. --- c/src/lib/libc/close.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'c/src/lib/libc/close.c') diff --git a/c/src/lib/libc/close.c b/c/src/lib/libc/close.c index 94ddb45c90..0583a36b22 100644 --- a/c/src/lib/libc/close.c +++ b/c/src/lib/libc/close.c @@ -22,17 +22,18 @@ int close( rtems_status_code rc; int status; - if ( rtems_file_descriptor_type( fd ) ) { + rtems_libio_check_fd(fd); + iop = rtems_libio_iop(fd); + if ( iop->flags & LIBIO_FLAGS_HANDLER_MASK ) { int (*fp)(int fd); - fp = rtems_libio_handlers[rtems_file_descriptor_type_index(fd)].close; + fp = rtems_libio_handlers[ + (iop->flags >> LIBIO_FLAGS_HANDLER_SHIFT) - 1].close; if ( fp == NULL ) set_errno_and_return_minus_one( EBADF ); status = (*fp)( fd ); return status; } - iop = rtems_libio_iop(fd); - rtems_libio_check_fd(fd); if ( !iop->handlers ) set_errno_and_return_minus_one( EBADF ); -- cgit v1.2.3