From 22ad82635882fc9b7f707ba3091c93b747284213 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 6 Nov 2011 11:57:10 +0000 Subject: =?UTF-8?q?2011-11-06=20=20=20=20=20=20Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR1945/cpukit * libfs/src/imfs/deviceio.c, libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_directory.c, libfs/src/imfs/imfs_fifo.c, libfs/src/imfs/memfile.c: Replace rtems_off64_t with off_t. --- cpukit/libfs/src/imfs/deviceio.c | 6 +++--- cpukit/libfs/src/imfs/imfs.h | 20 ++++++++++---------- cpukit/libfs/src/imfs/imfs_directory.c | 4 ++-- cpukit/libfs/src/imfs/imfs_fifo.c | 4 ++-- cpukit/libfs/src/imfs/memfile.c | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'cpukit/libfs') diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c index ff6cf2a01e..bb66703be9 100644 --- a/cpukit/libfs/src/imfs/deviceio.c +++ b/cpukit/libfs/src/imfs/deviceio.c @@ -203,9 +203,9 @@ int device_ioctl( * writes fail. */ -rtems_off64_t device_lseek( +off_t device_lseek( rtems_libio_t *iop, - rtems_off64_t offset, + off_t offset, int whence ) { @@ -226,7 +226,7 @@ rtems_off64_t device_lseek( int device_ftruncate( rtems_libio_t *iop, - rtems_off64_t length + off_t length ) { return 0; diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h index 2a6dc4c1e5..b412c2a1fe 100644 --- a/cpukit/libfs/src/imfs/imfs.h +++ b/cpukit/libfs/src/imfs/imfs.h @@ -102,14 +102,14 @@ typedef uint8_t *block_p; typedef block_p *block_ptr; typedef struct { - rtems_off64_t size; /* size of file in bytes */ + off_t size; /* size of file in bytes */ block_ptr indirect; /* array of 128 data blocks pointers */ block_ptr doubly_indirect; /* 128 indirect blocks */ block_ptr triply_indirect; /* 128 doubly indirect blocks */ } IMFS_memfile_t; typedef struct { - rtems_off64_t size; /* size of file in bytes */ + off_t size; /* size of file in bytes */ block_p direct; /* pointer to file image */ } IMFS_linearfile_t; @@ -407,7 +407,7 @@ extern int IMFS_memfile_remove( extern int memfile_ftruncate( rtems_libio_t *iop, /* IN */ - rtems_off64_t length /* IN */ + off_t length /* IN */ ); extern int imfs_dir_open( @@ -427,9 +427,9 @@ extern ssize_t imfs_dir_read( size_t count /* IN */ ); -extern rtems_off64_t imfs_dir_lseek( +extern off_t imfs_dir_lseek( rtems_libio_t *iop, /* IN */ - rtems_off64_t offset, /* IN */ + off_t offset, /* IN */ int whence /* IN */ ); @@ -472,9 +472,9 @@ extern int memfile_ioctl( void *buffer /* IN */ ); -extern rtems_off64_t memfile_lseek( +extern off_t memfile_lseek( rtems_libio_t *iop, /* IN */ - rtems_off64_t offset, /* IN */ + off_t offset, /* IN */ int whence /* IN */ ); @@ -507,15 +507,15 @@ extern int device_ioctl( void *buffer /* IN */ ); -extern rtems_off64_t device_lseek( +extern off_t device_lseek( rtems_libio_t *iop, /* IN */ - rtems_off64_t offset, /* IN */ + off_t offset, /* IN */ int whence /* IN */ ); extern int device_ftruncate( rtems_libio_t *iop, /* IN */ - rtems_off64_t length /* IN */ + off_t length /* IN */ ); extern int IMFS_utime( diff --git a/cpukit/libfs/src/imfs/imfs_directory.c b/cpukit/libfs/src/imfs/imfs_directory.c index 54f8a4e4cd..7e0c125104 100644 --- a/cpukit/libfs/src/imfs/imfs_directory.c +++ b/cpukit/libfs/src/imfs/imfs_directory.c @@ -181,9 +181,9 @@ int imfs_dir_close( * SEEK_END - N/A --> This will cause an EINVAL to be returned. */ -rtems_off64_t imfs_dir_lseek( +off_t imfs_dir_lseek( rtems_libio_t *iop, - rtems_off64_t offset, + off_t offset, int whence ) { diff --git a/cpukit/libfs/src/imfs/imfs_fifo.c b/cpukit/libfs/src/imfs/imfs_fifo.c index 7cb3bbcd85..e98a8df10d 100644 --- a/cpukit/libfs/src/imfs/imfs_fifo.c +++ b/cpukit/libfs/src/imfs/imfs_fifo.c @@ -116,9 +116,9 @@ int IMFS_fifo_ioctl( IMFS_FIFO_RETURN(err); } -rtems_off64_t IMFS_fifo_lseek( +off_t IMFS_fifo_lseek( rtems_libio_t *iop, - rtems_off64_t offset, + off_t offset, int whence ) { diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c index 49b9b99654..a85f475b78 100644 --- a/cpukit/libfs/src/imfs/memfile.c +++ b/cpukit/libfs/src/imfs/memfile.c @@ -201,9 +201,9 @@ int memfile_ioctl( * * This routine processes the lseek() system call. */ -rtems_off64_t memfile_lseek( +off_t memfile_lseek( rtems_libio_t *iop, - rtems_off64_t offset, + off_t offset, int whence ) { @@ -237,7 +237,7 @@ rtems_off64_t memfile_lseek( */ int memfile_ftruncate( rtems_libio_t *iop, - rtems_off64_t length + off_t length ) { IMFS_jnode_t *the_jnode; -- cgit v1.2.3