From 9c3fa30a11cf03041d05210a2ffbdaa9001999d4 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 28 Sep 2000 20:19:23 +0000 Subject: 2000-09-28 Joel Sherrill * libc/libio.h (rtems_filesystem_file_handlers_r, rtems_filesystem_operations_table): Added _h to all structure fields to indicate they are "handlers". * libc/libio_.h, libc/chdir.c, libc/chmod.c, libc/chown.c, libc/close.c, libc/eval.c, libc/fchdir.c, libc/fchmod.c, libc/fcntl.c, libc/fdatasync.c, libc/fstat.c, libc/fsync.c, libc/ftruncate.c, libc/getdents.c, libc/imfs_eval.c, libc/imfs_unlink.c, libc/ioctl.c, libc/ioman.c, libc/link.c, libc/lseek.c, libc/mknod.c, libc/mount.c, libc/open.c, libc/read.c, libc/readlink.c, libc/rmdir.c, libc/stat.c, libc/symlink.c, libc/unlink.c, libc/unmount.c, libc/utime.c, libc/write.c: Modified to reflect above name change. --- cpukit/libfs/src/imfs/imfs_eval.c | 8 ++++---- cpukit/libfs/src/imfs/imfs_unlink.c | 6 +++--- cpukit/libfs/src/imfs/ioman.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'cpukit/libfs/src') diff --git a/cpukit/libfs/src/imfs/imfs_eval.c b/cpukit/libfs/src/imfs/imfs_eval.c index 1f1e7c6daf..9cb459de64 100644 --- a/cpukit/libfs/src/imfs/imfs_eval.c +++ b/cpukit/libfs/src/imfs/imfs_eval.c @@ -333,7 +333,7 @@ int IMFS_evaluate_for_make( } else { newloc = pathloc->mt_entry->mt_point_node; *pathloc = newloc; - return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name ); + return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name ); } } else { @@ -381,7 +381,7 @@ int IMFS_evaluate_for_make( if ( node->info.directory.mt_fs != NULL ) { newloc = node->info.directory.mt_fs->mt_fs_root; *pathloc = newloc; - return (*pathloc->ops->evalformake)( &path[i-len], pathloc, name ); + return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name ); } /* @@ -526,7 +526,7 @@ int IMFS_eval_path( } else { newloc = pathloc->mt_entry->mt_point_node; *pathloc = newloc; - return (*pathloc->ops->evalpath)(&(pathname[i-len]),flags,pathloc); + return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),flags,pathloc); } } else { @@ -578,7 +578,7 @@ int IMFS_eval_path( if ( node->info.directory.mt_fs != NULL ) { newloc = node->info.directory.mt_fs->mt_fs_root; *pathloc = newloc; - return (*pathloc->ops->evalpath)( &pathname[i-len], flags, pathloc ); + return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc ); } /* diff --git a/cpukit/libfs/src/imfs/imfs_unlink.c b/cpukit/libfs/src/imfs/imfs_unlink.c index f001c6450d..b1d68e194a 100644 --- a/cpukit/libfs/src/imfs/imfs_unlink.c +++ b/cpukit/libfs/src/imfs/imfs_unlink.c @@ -25,7 +25,7 @@ int IMFS_unlink( { IMFS_jnode_t *node; rtems_filesystem_location_info_t the_link; - int result; + int result = 0; node = loc->node_access; @@ -56,7 +56,7 @@ int IMFS_unlink( node->info.hard_link.link_node->st_nlink --; IMFS_update_ctime( node->info.hard_link.link_node ); if ( node->info.hard_link.link_node->st_nlink < 1) { - result = (*the_link.handlers->rmnod)( &the_link ); + result = (*the_link.handlers->rmnod_h)( &the_link ); if ( result != 0 ) return -1; } @@ -66,7 +66,7 @@ int IMFS_unlink( * Now actually free the node we were asked to free. */ - result = (*loc->handlers->rmnod)( loc ); + result = (*loc->handlers->rmnod_h)( loc ); return result; } diff --git a/cpukit/libfs/src/imfs/ioman.c b/cpukit/libfs/src/imfs/ioman.c index 4f592a6094..e9b486937c 100644 --- a/cpukit/libfs/src/imfs/ioman.c +++ b/cpukit/libfs/src/imfs/ioman.c @@ -80,12 +80,12 @@ rtems_status_code rtems_io_lookup_name( result = rtems_filesystem_evaluate_path( name, 0x00, &loc, TRUE ); the_jnode = loc.node_access; - if ( !loc.ops->node_type ) { + if ( !loc.ops->node_type_h ) { rtems_filesystem_freenode( &loc ); set_errno_and_return_minus_one( ENOTSUP ); } - node_type = (*loc.ops->node_type)( &loc ); + node_type = (*loc.ops->node_type_h)( &loc ); if ( (result != 0) || node_type != RTEMS_FILESYSTEM_DEVICE ) { *device_info = 0; -- cgit v1.2.3