2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>

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.
This commit is contained in:
Ralf Corsepius
2011-11-06 11:57:10 +00:00
parent 59ca2f8ccb
commit 22ad826358
6 changed files with 24 additions and 22 deletions
+4 -2
View File
@@ -8,8 +8,10 @@
libfs/src/defaults/default_lseek.c:
Replace rtems_off64_t with off_t.
* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_dir.c,
libfs/src/dosfs/msdos_file.c:
Replace rtems_off64_t with off_t.
libfs/src/dosfs/msdos_file.c: Replace rtems_off64_t with off_t.
* 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.
2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
+3 -3
View File
@@ -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;
+10 -10
View File
@@ -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(
+2 -2
View File
@@ -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
)
{
+2 -2
View File
@@ -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
)
{
+3 -3
View File
@@ -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;