diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-11-06 12:00:04 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-11-06 12:00:04 +0000 |
| commit | 984c4c492fb61f8f2c8f0900b34e7ec41155450b (patch) | |
| tree | 17c6d2cd21c726cba2758c6e409b541d428893e0 /cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c | |
| parent | 2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-984c4c492fb61f8f2c8f0900b34e7ec41155450b.tar.bz2 | |
2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
PR1945/cpukit
* libfs/src/nfsclient/src/nfs.c, libfs/src/rfs/rtems-rfs-rtems-dev.c,
libfs/src/rfs/rtems-rfs-rtems-dir.c,
libfs/src/rfs/rtems-rfs-rtems-file.c, libnetworking/lib/ftpfs.c,
libnetworking/lib/tftpDriver.c: Replace rtems_off64_t with off_t.
Diffstat (limited to 'cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c')
| -rw-r--r-- | cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c index 2f2df428dd..9f2957b0ee 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c @@ -24,6 +24,14 @@ #include <inttypes.h> +#if SIZEOF_OFF_T == 8 +#define PRIdoff_t PRId64 +#elif SIZEOF_OFF_T == 4 +#define PRIdoff_t PRId32 +#else +#error "unsupported size of off_t" +#endif + #include <rtems/rfs/rtems-rfs-file.h> #include "rtems-rfs-rtems.h" @@ -272,11 +280,11 @@ rtems_rfs_rtems_file_ioctl (rtems_libio_t* iop, uint32_t command, void* buffer) * @param iop * @param offset * @param whence - * @return rtems_off64_t + * @return off_t */ -static rtems_off64_t +static off_t rtems_rfs_rtems_file_lseek (rtems_libio_t* iop, - rtems_off64_t offset, + off_t offset, int whence) { rtems_rfs_file_handle* file = rtems_rfs_rtems_get_iop_file_handle (iop); @@ -284,7 +292,7 @@ rtems_rfs_rtems_file_lseek (rtems_libio_t* iop, int rc; if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FILE_LSEEK)) - printf("rtems-rfs: file-lseek: handle:%p offset:%Ld\n", file, offset); + printf("rtems-rfs: file-lseek: handle:%p offset:%" PRIdoff_t "\n", file, offset); rtems_rfs_rtems_lock (rtems_rfs_file_fs (file)); @@ -311,13 +319,13 @@ rtems_rfs_rtems_file_lseek (rtems_libio_t* iop, */ static int rtems_rfs_rtems_file_ftruncate (rtems_libio_t* iop, - rtems_off64_t length) + off_t length) { rtems_rfs_file_handle* file = rtems_rfs_rtems_get_iop_file_handle (iop); int rc; if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FILE_FTRUNC)) - printf("rtems-rfs: file-ftrunc: handle:%p length:%Ld\n", file, length); + printf("rtems-rfs: file-ftrunc: handle:%p length:%" PRIdoff_t "\n", file, length); rtems_rfs_rtems_lock (rtems_rfs_file_fs (file)); |