RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-03-09 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
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.
This commit is contained in:
Joel Sherrill
2009-03-09 14:11:23 +00:00
parent 5722465732
commit f855b9e3d8
12 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/ChangeLog
View File

@@ -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/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 <joel.sherrill@oarcorp.com>
* score/inline/rtems/score/heap.inl: Use the correct fields and do end

2
cpukit/libcsupport/include/rtems/libio.h
View File

@@ -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

4
cpukit/libfs/src/dosfs/fat_file.c
View File

@@ -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,

4
cpukit/libfs/src/dosfs/msdos.h
View File

@@ -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 */

2
cpukit/libfs/src/dosfs/msdos_dir.c
View File

@@ -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)

2
cpukit/libfs/src/dosfs/msdos_file.c
View File

@@ -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;

2
cpukit/libfs/src/imfs/deviceio.c
View File

@@ -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

6
cpukit/libfs/src/imfs/imfs.h
View File

@@ -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 */

2
cpukit/libfs/src/imfs/imfs_directory.c
View File

@@ -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

4
cpukit/libfs/src/imfs/imfs_fifo.c
View File

@@ -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);
}

2
cpukit/libfs/src/imfs/memfile.c
View File

@@ -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

4
cpukit/libfs/src/nfsclient/src/nfs.c
View File

@@ -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