diff options
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/_rename_r.c | 29 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/getdents.c | 8 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/unlink.c | 7 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/utime.c | 5 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/writev.c | 3 |
6 files changed, 7 insertions, 52 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index c13a31efee..bede68aed0 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2010-07-01 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libcsupport/src/_rename_r.c, libcsupport/src/getdents.c, + libcsupport/src/unlink.c, libcsupport/src/utime.c, + libcsupport/src/writev.c: Remove remaining checks for missing + handlers. + 2010-07-01 Vinu Rajashekhar <vinutheraj@gmail.com> PR 1597/cpukit diff --git a/cpukit/libcsupport/src/_rename_r.c b/cpukit/libcsupport/src/_rename_r.c index f1e73fc18d..51010df28e 100644 --- a/cpukit/libcsupport/src/_rename_r.c +++ b/cpukit/libcsupport/src/_rename_r.c @@ -79,13 +79,6 @@ int _rename_r( rtems_filesystem_get_start_loc( new, &i, &new_parent_loc ); - if ( !new_parent_loc.ops->evalformake_h ) { - if ( free_old_parentloc ) - rtems_filesystem_freenode( &old_parent_loc ); - rtems_filesystem_freenode( &old_loc ); - rtems_set_errno_and_return_minus_one( ENOTSUP ); - } - result = (*new_parent_loc.ops->evalformake_h)( &new[i], &new_parent_loc, &name ); if ( result != 0 ) { rtems_filesystem_freenode( &new_parent_loc ); @@ -108,14 +101,6 @@ int _rename_r( rtems_set_errno_and_return_minus_one( EXDEV ); } - if ( !new_parent_loc.ops->rename_h ) { - rtems_filesystem_freenode( &new_parent_loc ); - if ( free_old_parentloc ) - rtems_filesystem_freenode( &old_parent_loc ); - rtems_filesystem_freenode( &old_loc ); - rtems_set_errno_and_return_minus_one( ENOTSUP ); - } - result = (*new_parent_loc.ops->rename_h)( &old_parent_loc, &old_loc, &new_parent_loc, name ); rtems_filesystem_freenode( &new_parent_loc ); @@ -125,18 +110,4 @@ int _rename_r( return result; } - -#if 0 - struct stat sb; - int s; - - s = stat( old, &sb); - if ( s < 0 ) - return s; - s = link( old, new ); - if ( s < 0 ) - return s; - return S_ISDIR(sb.st_mode) ? rmdir( old ) : unlink( old ); -#endif - #endif diff --git a/cpukit/libcsupport/src/getdents.c b/cpukit/libcsupport/src/getdents.c index ca4c36727f..6b5dbfe76c 100644 --- a/cpukit/libcsupport/src/getdents.c +++ b/cpukit/libcsupport/src/getdents.c @@ -38,16 +38,12 @@ int getdents( /* * Get the file control block structure associated with the file descriptor */ - iop = rtems_libio_iop( dd_fd ); /* * Make sure we are working on a directory */ loc = iop->pathinfo; - if ( !loc.ops->node_type_h ) - rtems_set_errno_and_return_minus_one( ENOTSUP ); - if ( (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) rtems_set_errno_and_return_minus_one( ENOTDIR ); @@ -55,9 +51,5 @@ int getdents( * Return the number of bytes that were actually transfered as a result * of the read attempt. */ - - if ( !iop->handlers->read_h ) - rtems_set_errno_and_return_minus_one( ENOTSUP ); - return (*iop->handlers->read_h)( iop, dd_buf, dd_len ); } diff --git a/cpukit/libcsupport/src/unlink.c b/cpukit/libcsupport/src/unlink.c index caaf9606cc..bb28959b6d 100644 --- a/cpukit/libcsupport/src/unlink.c +++ b/cpukit/libcsupport/src/unlink.c @@ -74,13 +74,6 @@ int unlink( rtems_set_errno_and_return_minus_one( EISDIR ); } - if ( !loc.ops->unlink_h ) { - rtems_filesystem_freenode( &loc ); - if ( free_parentloc ) - rtems_filesystem_freenode( &parentloc ); - rtems_set_errno_and_return_minus_one( ENOTSUP ); - } - result = (*loc.ops->unlink_h)( &parentloc, &loc ); rtems_filesystem_freenode( &loc ); diff --git a/cpukit/libcsupport/src/utime.c b/cpukit/libcsupport/src/utime.c index b6f1954dae..25bcb0761b 100644 --- a/cpukit/libcsupport/src/utime.c +++ b/cpukit/libcsupport/src/utime.c @@ -34,11 +34,6 @@ int utime( if ( rtems_filesystem_evaluate_path( path, strlen( path ), 0x00, &temp_loc, true ) ) return -1; - if ( !temp_loc.ops->utime_h ){ - rtems_filesystem_freenode( &temp_loc ); - rtems_set_errno_and_return_minus_one( ENOTSUP ); - } - if ( times == NULL ) { now.actime = now.modtime = time( NULL ); times = &now; diff --git a/cpukit/libcsupport/src/writev.c b/cpukit/libcsupport/src/writev.c index a453209d87..151258e3a4 100644 --- a/cpukit/libcsupport/src/writev.c +++ b/cpukit/libcsupport/src/writev.c @@ -55,9 +55,6 @@ ssize_t writev( if ( iovcnt > IOV_MAX ) rtems_set_errno_and_return_minus_one( EINVAL ); - if ( !iop->handlers->write_h ) - rtems_set_errno_and_return_minus_one( ENOTSUP ); - /* * OpenGroup says that you are supposed to return EINVAL if the * sum of the iov_len values in the iov array would overflow a |