diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-03-09 14:12:58 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-03-09 14:12:58 +0000 |
commit | 64504e971d936812518c55e663e8a51e670212f1 (patch) | |
tree | ec812b03c7167848c0021264e0e30e4d87e8f26a /cpukit | |
parent | Clean up mishaps arising from multiple folks trying to fix the same problem. (diff) | |
download | rtems-64504e971d936812518c55e663e8a51e670212f1.tar.bz2 |
2009-03-09 Joel Sherrill <joel.sherrill@OARcorp.com>
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/memfile.c, libfs/src/nfsclient/src/nfs.c: lseek
handlers should return off_t.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 10 | ||||
-rw-r--r-- | cpukit/libcsupport/include/rtems/libio.h | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/dosfs/fat_file.c | 4 | ||||
-rw-r--r-- | cpukit/libfs/src/dosfs/msdos.h | 4 | ||||
-rw-r--r-- | cpukit/libfs/src/dosfs/msdos_dir.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/dosfs/msdos_file.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/deviceio.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/imfs.h | 6 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/imfs_directory.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/memfile.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/nfsclient/src/nfs.c | 4 |
11 files changed, 25 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index b546fe8929..b782c63e0a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,13 @@ +2009-03-09 Joel Sherrill <joel.sherrill@OARcorp.com> + + 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/memfile.c, libfs/src/nfsclient/src/nfs.c: lseek + handlers should return off_t. + 2009-03-02 Joel Sherrill <joel.sherrill@OARcorp.com> PR 1388/cpukit diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index 1767d1d789..7e2f3ffc60 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 5d8c383b89..4dfa2131be 100644 --- a/cpukit/libfs/src/imfs/deviceio.c +++ b/cpukit/libfs/src/imfs/deviceio.c @@ -235,7 +235,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 bd56bd57f4..ee326deb9a 100644 --- a/cpukit/libfs/src/imfs/imfs.h +++ b/cpukit/libfs/src/imfs/imfs.h @@ -391,7 +391,7 @@ ssize_t imfs_dir_read( size_t count /* IN */ ); -int imfs_dir_lseek( +off_t imfs_dir_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ @@ -435,7 +435,7 @@ int memfile_ioctl( void *buffer /* IN */ ); -int memfile_lseek( +off_t memfile_lseek( rtems_libio_t *iop, /* IN */ off_t offset, /* IN */ int whence /* IN */ @@ -474,7 +474,7 @@ int device_ioctl( void *buffer /* IN */ ); -int device_lseek( +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/memfile.c b/cpukit/libfs/src/imfs/memfile.c index 2391373acb..e3d361b24b 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 164efa108a..959980770a 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -2747,7 +2747,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 @@ -2780,7 +2780,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 |