From f855b9e3d854045d3a2a261b7e1f205e7630541f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 9 Mar 2009 14:11:23 +0000 Subject: 2009-03-09 Joel Sherrill PR 1376/filesystem * libcsupport/include/rtems/libio.h, libfs/src/dosfs/fat_file.c, libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_dir.c, libfs/src/dosfs/msdos_file.c, 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, libfs/src/nfsclient/src/nfs.c: lseek handlers should return off_t. --- cpukit/ChangeLog | 10 ++++++++++ cpukit/libcsupport/include/rtems/libio.h | 2 +- cpukit/libfs/src/dosfs/fat_file.c | 4 ++-- cpukit/libfs/src/dosfs/msdos.h | 4 ++-- cpukit/libfs/src/dosfs/msdos_dir.c | 2 +- cpukit/libfs/src/dosfs/msdos_file.c | 2 +- cpukit/libfs/src/imfs/deviceio.c | 2 +- cpukit/libfs/src/imfs/imfs.h | 6 +++--- cpukit/libfs/src/imfs/imfs_directory.c | 2 +- cpukit/libfs/src/imfs/imfs_fifo.c | 4 ++-- cpukit/libfs/src/imfs/memfile.c | 2 +- cpukit/libfs/src/nfsclient/src/nfs.c | 4 ++-- 12 files changed, 27 insertions(+), 17 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0ea66a2762..65ccaa586a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,13 @@ +2009-03-09 Joel Sherrill + + PR 1376/filesystem + * libcsupport/include/rtems/libio.h, libfs/src/dosfs/fat_file.c, + libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_dir.c, + libfs/src/dosfs/msdos_file.c, 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, + libfs/src/nfsclient/src/nfs.c: lseek handlers should return off_t. + 2009-03-06 Joel Sherrill * score/inline/rtems/score/heap.inl: Use the correct fields and do end diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index 9147218629..83872b760a 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -83,7 +83,7 @@ typedef int (*rtems_filesystem_ioctl_t)( void *buffer ); -typedef int (*rtems_filesystem_lseek_t)( +typedef off_t (*rtems_filesystem_lseek_t)( rtems_libio_t *iop, off_t length, int whence diff --git a/cpukit/libfs/src/dosfs/fat_file.c b/cpukit/libfs/src/dosfs/fat_file.c index 6bf482e927..42204bacd7 100644 --- a/cpukit/libfs/src/dosfs/fat_file.c +++ b/cpukit/libfs/src/dosfs/fat_file.c @@ -49,7 +49,7 @@ _hash_search( fat_file_fd_t **ret ); -static int +static off_t fat_file_lseek( rtems_filesystem_mount_table_entry_t *mt_entry, fat_file_fd_t *fat_fd, @@ -940,7 +940,7 @@ _hash_search( return -1; } -static int +static off_t fat_file_lseek( rtems_filesystem_mount_table_entry_t *mt_entry, fat_file_fd_t *fat_fd, diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h index 0c98cc3446..a1afcba8dc 100644 --- a/cpukit/libfs/src/dosfs/msdos.h +++ b/cpukit/libfs/src/dosfs/msdos.h @@ -258,7 +258,7 @@ ssize_t msdos_file_write( size_t count /* IN */ ); -int msdos_file_lseek( +off_t msdos_file_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ @@ -308,7 +308,7 @@ ssize_t msdos_dir_read( size_t count /* IN */ ); -int msdos_dir_lseek( +off_t msdos_dir_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ diff --git a/cpukit/libfs/src/dosfs/msdos_dir.c b/cpukit/libfs/src/dosfs/msdos_dir.c index a0653de9e9..92dbf0435f 100644 --- a/cpukit/libfs/src/dosfs/msdos_dir.c +++ b/cpukit/libfs/src/dosfs/msdos_dir.c @@ -363,7 +363,7 @@ msdos_dir_read(rtems_libio_t *iop, void *buffer, size_t count) * RC_OK on success, or -1 if error occured (errno * set apropriately). */ -int +off_t msdos_dir_lseek(rtems_libio_t *iop, off_t offset, int whence) { switch (whence) diff --git a/cpukit/libfs/src/dosfs/msdos_file.c b/cpukit/libfs/src/dosfs/msdos_file.c index c8293d5b24..471d4a04dc 100644 --- a/cpukit/libfs/src/dosfs/msdos_file.c +++ b/cpukit/libfs/src/dosfs/msdos_file.c @@ -223,7 +223,7 @@ msdos_file_write(rtems_libio_t *iop,const void *buffer, size_t count) * new offset on success, or -1 if error occured (errno set * appropriately). */ -int +off_t msdos_file_lseek(rtems_libio_t *iop, off_t offset, int whence) { int rc = RC_OK; diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c index dc5cc1b4f4..719b3e830c 100644 --- a/cpukit/libfs/src/imfs/deviceio.c +++ b/cpukit/libfs/src/imfs/deviceio.c @@ -209,7 +209,7 @@ int device_ioctl( * This handler eats all lseek() operations. */ -int device_lseek( +off_t device_lseek( rtems_libio_t *iop, off_t offset, int whence diff --git a/cpukit/libfs/src/imfs/imfs.h b/cpukit/libfs/src/imfs/imfs.h index e400c48c4a..808a6f0cb7 100644 --- a/cpukit/libfs/src/imfs/imfs.h +++ b/cpukit/libfs/src/imfs/imfs.h @@ -400,7 +400,7 @@ extern ssize_t imfs_dir_read( size_t count /* IN */ ); -extern int imfs_dir_lseek( +extern off_t imfs_dir_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ @@ -444,7 +444,7 @@ extern int memfile_ioctl( void *buffer /* IN */ ); -extern int memfile_lseek( +extern off_t memfile_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ @@ -483,7 +483,7 @@ extern int device_ioctl( void *buffer /* IN */ ); -extern int device_lseek( +extern off_t device_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ diff --git a/cpukit/libfs/src/imfs/imfs_directory.c b/cpukit/libfs/src/imfs/imfs_directory.c index fd3988b59e..519d534fe0 100644 --- a/cpukit/libfs/src/imfs/imfs_directory.c +++ b/cpukit/libfs/src/imfs/imfs_directory.c @@ -182,7 +182,7 @@ int imfs_dir_close( * SEEK_END - N/A --> This will cause an assert. */ -int imfs_dir_lseek( +off_t imfs_dir_lseek( rtems_libio_t *iop, off_t offset, int whence diff --git a/cpukit/libfs/src/imfs/imfs_fifo.c b/cpukit/libfs/src/imfs/imfs_fifo.c index 97fef98db6..5d3cf466c6 100644 --- a/cpukit/libfs/src/imfs/imfs_fifo.c +++ b/cpukit/libfs/src/imfs/imfs_fifo.c @@ -119,13 +119,13 @@ int IMFS_fifo_ioctl( IMFS_FIFO_RETURN(err); } -int IMFS_fifo_lseek( +off_t IMFS_fifo_lseek( rtems_libio_t *iop, off_t offset, int whence ) { - int err = pipe_lseek(LIBIO2PIPE(iop), offset, whence, iop); + off_t err = pipe_lseek(LIBIO2PIPE(iop), offset, whence, iop); IMFS_FIFO_RETURN(err); } diff --git a/cpukit/libfs/src/imfs/memfile.c b/cpukit/libfs/src/imfs/memfile.c index a0a89f64ec..51ad8669bb 100644 --- a/cpukit/libfs/src/imfs/memfile.c +++ b/cpukit/libfs/src/imfs/memfile.c @@ -214,7 +214,7 @@ int memfile_ioctl( * This routine processes the lseek() system call. */ -int memfile_lseek( +off_t memfile_lseek( rtems_libio_t *iop, off_t offset, int whence diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c index 9ad01c0cf1..78c592a363 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -2737,7 +2737,7 @@ static int nfs_file_ioctl( #define nfs_link_ioctl 0 #endif -static int nfs_file_lseek( +static off_t nfs_file_lseek( rtems_libio_t *iop, off_t length, int whence @@ -2770,7 +2770,7 @@ static int nfs_file_lseek( return iop->offset; } -static int nfs_dir_lseek( +static off_t nfs_dir_lseek( rtems_libio_t *iop, off_t length, int whence -- cgit v1.2.3