2001-10-26 Joel Sherrill <joel@OARcorp.com>

* libc/libio.c: Cleanup of initialization per suggestion from
	Eric Norum.
This commit is contained in:
Joel Sherrill
2001-10-26 19:22:03 +00:00
parent d6a2391ff3
commit 1e4968e4d7
4 changed files with 20 additions and 48 deletions

View File

@@ -189,13 +189,16 @@ unsigned32 rtems_libio_to_fcntl_flags(
rtems_libio_t *rtems_libio_allocate( void )
{
rtems_libio_t *iop;
rtems_libio_t *iop, *next;
rtems_status_code rc;
rtems_semaphore_obtain( rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT );
if (rtems_libio_iop_freelist) {
iop = rtems_libio_iop_freelist;
next = iop->data1;
(void) memset( iop, 0, sizeof(rtems_libio_t) );
iop->flags = LIBIO_FLAGS_OPEN;
rc = rtems_semaphore_create(
RTEMS_LIBIO_IOP_SEM(iop - rtems_libio_iops),
1,
@@ -205,21 +208,7 @@ rtems_libio_t *rtems_libio_allocate( void )
);
if (rc != RTEMS_SUCCESSFUL)
goto failed;
rtems_libio_iop_freelist = iop->data1;
iop->driver = NULL;
iop->size = 0;
iop->offset = 0;
iop->flags = LIBIO_FLAGS_OPEN;
iop->pathinfo.node_access = NULL;
iop->pathinfo.handlers = NULL;
iop->pathinfo.ops = NULL;
iop->pathinfo.mt_entry = NULL;
iop->data0 = 0;
iop->data1 = NULL;
iop->file_info = NULL;
iop->handlers = NULL;
rtems_libio_iop_freelist = next;
goto done;
}

View File

@@ -1,3 +1,8 @@
2001-10-26 Joel Sherrill <joel@OARcorp.com>
* libc/libio.c: Cleanup of initialization per suggestion from
Eric Norum.
2001-10-25 Jennifer Averett <jennifer@OARcorp.com>
* libc/unmount.c: Primarily restructuring and clean up to address

View File

@@ -189,13 +189,16 @@ unsigned32 rtems_libio_to_fcntl_flags(
rtems_libio_t *rtems_libio_allocate( void )
{
rtems_libio_t *iop;
rtems_libio_t *iop, *next;
rtems_status_code rc;
rtems_semaphore_obtain( rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT );
if (rtems_libio_iop_freelist) {
iop = rtems_libio_iop_freelist;
next = iop->data1;
(void) memset( iop, 0, sizeof(rtems_libio_t) );
iop->flags = LIBIO_FLAGS_OPEN;
rc = rtems_semaphore_create(
RTEMS_LIBIO_IOP_SEM(iop - rtems_libio_iops),
1,
@@ -205,21 +208,7 @@ rtems_libio_t *rtems_libio_allocate( void )
);
if (rc != RTEMS_SUCCESSFUL)
goto failed;
rtems_libio_iop_freelist = iop->data1;
iop->driver = NULL;
iop->size = 0;
iop->offset = 0;
iop->flags = LIBIO_FLAGS_OPEN;
iop->pathinfo.node_access = NULL;
iop->pathinfo.handlers = NULL;
iop->pathinfo.ops = NULL;
iop->pathinfo.mt_entry = NULL;
iop->data0 = 0;
iop->data1 = NULL;
iop->file_info = NULL;
iop->handlers = NULL;
rtems_libio_iop_freelist = next;
goto done;
}

View File

@@ -189,13 +189,16 @@ unsigned32 rtems_libio_to_fcntl_flags(
rtems_libio_t *rtems_libio_allocate( void )
{
rtems_libio_t *iop;
rtems_libio_t *iop, *next;
rtems_status_code rc;
rtems_semaphore_obtain( rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT );
if (rtems_libio_iop_freelist) {
iop = rtems_libio_iop_freelist;
next = iop->data1;
(void) memset( iop, 0, sizeof(rtems_libio_t) );
iop->flags = LIBIO_FLAGS_OPEN;
rc = rtems_semaphore_create(
RTEMS_LIBIO_IOP_SEM(iop - rtems_libio_iops),
1,
@@ -205,21 +208,7 @@ rtems_libio_t *rtems_libio_allocate( void )
);
if (rc != RTEMS_SUCCESSFUL)
goto failed;
rtems_libio_iop_freelist = iop->data1;
iop->driver = NULL;
iop->size = 0;
iop->offset = 0;
iop->flags = LIBIO_FLAGS_OPEN;
iop->pathinfo.node_access = NULL;
iop->pathinfo.handlers = NULL;
iop->pathinfo.ops = NULL;
iop->pathinfo.mt_entry = NULL;
iop->data0 = 0;
iop->data1 = NULL;
iop->file_info = NULL;
iop->handlers = NULL;
rtems_libio_iop_freelist = next;
goto done;
}