change log for rtems (2011-11-06)

rtems-vc at rtems.org rtems-vc at rtems.org
Sun Nov 6 12:10:17 UTC 2011


 *ralf*:
2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>

	PR1945/cpukit
	* libcsupport/include/rtems/libio.h: Mark rtems_off64_t as
	deprecated.
	Replace rtems_off64_t with off_t.

M 1.2978  cpukit/ChangeLog
M   1.82  cpukit/libcsupport/include/rtems/libio.h

diff -u rtems/cpukit/ChangeLog:1.2977 rtems/cpukit/ChangeLog:1.2978
--- rtems/cpukit/ChangeLog:1.2977	Sun Nov  6 01:08:31 2011
+++ rtems/cpukit/ChangeLog	Sun Nov  6 05:50:21 2011
@@ -1,5 +1,12 @@
 2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	PR1945/cpukit
+	* libcsupport/include/rtems/libio.h: Mark rtems_off64_t as
+	deprecated.
+	Replace rtems_off64_t with off_t.
+
+2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>
+
 	* libfs/src/rfs/rtems-rfs-dir.c: Rename PRIdoff_t into PRIooff_t.
 
 2011-11-04      Chris Johns <chrisj at rtems.org>

diff -u rtems/cpukit/libcsupport/include/rtems/libio.h:1.81 rtems/cpukit/libcsupport/include/rtems/libio.h:1.82
--- rtems/cpukit/libcsupport/include/rtems/libio.h:1.81	Tue Oct 18 09:37:47 2011
+++ rtems/cpukit/libcsupport/include/rtems/libio.h	Sun Nov  6 05:50:21 2011
@@ -49,11 +49,7 @@
  * @{
  */
 
-/**
- * A 64-bit file offset for internal use by RTEMS. Based on the Newlib
- * type.
- */
-typedef _off64_t rtems_off64_t;
+typedef off_t rtems_off64_t __attribute__((deprecated));
 
 /**
  * @brief File system node types.
@@ -126,9 +122,9 @@
  *  This type defines the interface to the lseek(2) system call 
  *  support which is provided by a file system implementation.
  */
-typedef rtems_off64_t (*rtems_filesystem_lseek_t)(
+typedef off_t (*rtems_filesystem_lseek_t)(
   rtems_libio_t *iop,
-  rtems_off64_t  length,
+  off_t          length,
   int            whence
 );
 
@@ -156,7 +152,7 @@
  */
 typedef int (*rtems_filesystem_ftruncate_t)(
   rtems_libio_t *iop,
-  rtems_off64_t  length
+  off_t          length
 );
 
 /**
@@ -417,9 +413,9 @@
  *  This method defines the interface to the default lseek(2) system call 
  *  support which is provided by a file system implementation.
  */
-rtems_off64_t rtems_filesystem_default_lseek(
+off_t rtems_filesystem_default_lseek(
   rtems_libio_t *iop,
-  rtems_off64_t  length,
+  off_t          length,
   int            whence
 );
 
@@ -447,7 +443,7 @@
  */
 int rtems_filesystem_default_ftruncate(
   rtems_libio_t *iop,
-  rtems_off64_t  length
+  off_t          length
 );
 
 /**
@@ -1112,8 +1108,8 @@
  */
 struct rtems_libio_tt {
   rtems_driver_name_t                    *driver;
-  rtems_off64_t                           size;      /* size of file */
-  rtems_off64_t                           offset;    /* current offset into file */
+  off_t                                   size;      /* size of file */
+  off_t                                   offset;    /* current offset into file */
   uint32_t                                flags;
   rtems_filesystem_location_info_t        pathinfo;
   rtems_id                                sem;
@@ -1129,7 +1125,7 @@
  */
 typedef struct {
   rtems_libio_t          *iop;
-  rtems_off64_t           offset;
+  off_t                   offset;
   char                   *buffer;
   uint32_t                count;
   uint32_t                flags;
@@ -1208,9 +1204,9 @@
   void       *buffer
 );
 
-typedef rtems_off64_t (*rtems_libio_lseek_t)(
+typedef off_t (*rtems_libio_lseek_t)(
   int           fd,
-  rtems_off64_t offset,
+  off_t         offset,
   int           whence
 );
 


 *ralf*:
2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>

	PR1945/cpukit
	* libfs/src/defaults/default_ftruncate.c,
	libfs/src/defaults/default_lseek.c:
	Replace rtems_off64_t with off_t.

M 1.2979  cpukit/ChangeLog
M    1.3  cpukit/libfs/src/defaults/default_ftruncate.c
M    1.3  cpukit/libfs/src/defaults/default_lseek.c

diff -u rtems/cpukit/ChangeLog:1.2978 rtems/cpukit/ChangeLog:1.2979
--- rtems/cpukit/ChangeLog:1.2978	Sun Nov  6 05:50:21 2011
+++ rtems/cpukit/ChangeLog	Sun Nov  6 05:52:44 2011
@@ -4,6 +4,9 @@
 	* libcsupport/include/rtems/libio.h: Mark rtems_off64_t as
 	deprecated.
 	Replace rtems_off64_t with off_t.
+	* libfs/src/defaults/default_ftruncate.c, 
+	libfs/src/defaults/default_lseek.c:
+	Replace rtems_off64_t with off_t.
 
 2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>
 

diff -u rtems/cpukit/libfs/src/defaults/default_ftruncate.c:1.2 rtems/cpukit/libfs/src/defaults/default_ftruncate.c:1.3
--- rtems/cpukit/libfs/src/defaults/default_ftruncate.c:1.2	Mon Jun 28 20:53:18 2010
+++ rtems/cpukit/libfs/src/defaults/default_ftruncate.c	Sun Nov  6 05:52:45 2011
@@ -15,7 +15,7 @@
 
 int rtems_filesystem_default_ftruncate(
   rtems_libio_t *iop,
-  rtems_off64_t  length
+  off_t          length
 )
 {
   rtems_set_errno_and_return_minus_one( ENOTSUP );

diff -u rtems/cpukit/libfs/src/defaults/default_lseek.c:1.2 rtems/cpukit/libfs/src/defaults/default_lseek.c:1.3
--- rtems/cpukit/libfs/src/defaults/default_lseek.c:1.2	Mon Jun 28 20:53:18 2010
+++ rtems/cpukit/libfs/src/defaults/default_lseek.c	Sun Nov  6 05:52:45 2011
@@ -13,9 +13,9 @@
 #include <rtems/libio_.h>
 #include <rtems/seterr.h>
 
-rtems_off64_t rtems_filesystem_default_lseek(
+off_t rtems_filesystem_default_lseek(
   rtems_libio_t *iop,
-  rtems_off64_t  length,
+  off_t          length,
   int            whence
 )
 {


 *ralf*:
2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>

	PR1945/cpukit
	* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_dir.c,
	libfs/src/dosfs/msdos_file.c:
	Replace rtems_off64_t with off_t.

M 1.2980  cpukit/ChangeLog
M   1.28  cpukit/libfs/src/dosfs/msdos.h
M   1.22  cpukit/libfs/src/dosfs/msdos_dir.c
M   1.17  cpukit/libfs/src/dosfs/msdos_file.c

diff -u rtems/cpukit/ChangeLog:1.2979 rtems/cpukit/ChangeLog:1.2980
--- rtems/cpukit/ChangeLog:1.2979	Sun Nov  6 05:52:44 2011
+++ rtems/cpukit/ChangeLog	Sun Nov  6 05:54:48 2011
@@ -7,6 +7,9 @@
 	* libfs/src/defaults/default_ftruncate.c, 
 	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.
 
 2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>
 

diff -u rtems/cpukit/libfs/src/dosfs/msdos.h:1.27 rtems/cpukit/libfs/src/dosfs/msdos.h:1.28
--- rtems/cpukit/libfs/src/dosfs/msdos.h:1.27	Mon Dec 27 08:35:13 2010
+++ rtems/cpukit/libfs/src/dosfs/msdos.h	Sun Nov  6 05:54:48 2011
@@ -291,9 +291,9 @@
   size_t         count            /* IN  */
 );
 
-rtems_off64_t msdos_file_lseek(
+off_t msdos_file_lseek(
   rtems_libio_t        *iop,              /* IN  */
-  rtems_off64_t         offset,           /* IN  */
+  off_t                 offset,           /* IN  */
   int                   whence            /* IN  */
 );
 
@@ -305,7 +305,7 @@
 int
 msdos_file_ftruncate(
   rtems_libio_t *iop,               /* IN  */
-  rtems_off64_t  length            /* IN  */
+  off_t          length            /* IN  */
 );
 
 int msdos_file_sync(rtems_libio_t *iop);
@@ -342,9 +342,9 @@
   size_t         count             /* IN  */
 );
 
-rtems_off64_t msdos_dir_lseek(
+off_t msdos_dir_lseek(
   rtems_libio_t        *iop,              /* IN  */
-  rtems_off64_t         offset,           /* IN  */
+  off_t                 offset,           /* IN  */
   int                   whence            /* IN  */
 );
 

diff -u rtems/cpukit/libfs/src/dosfs/msdos_dir.c:1.21 rtems/cpukit/libfs/src/dosfs/msdos_dir.c:1.22
--- rtems/cpukit/libfs/src/dosfs/msdos_dir.c:1.21	Thu Jul 21 07:03:25 2011
+++ rtems/cpukit/libfs/src/dosfs/msdos_dir.c	Sun Nov  6 05:54:49 2011
@@ -497,8 +497,8 @@
  *     RC_OK on success, or -1 if error occured (errno
  *     set apropriately).
  */
-rtems_off64_t
-msdos_dir_lseek(rtems_libio_t *iop, rtems_off64_t offset, int whence)
+off_t        
+msdos_dir_lseek(rtems_libio_t *iop, off_t offset, int whence)
 {
     switch (whence)
     {

diff -u rtems/cpukit/libfs/src/dosfs/msdos_file.c:1.16 rtems/cpukit/libfs/src/dosfs/msdos_file.c:1.17
--- rtems/cpukit/libfs/src/dosfs/msdos_file.c:1.16	Thu Oct 20 05:48:30 2011
+++ rtems/cpukit/libfs/src/dosfs/msdos_file.c	Sun Nov  6 05:54:49 2011
@@ -222,8 +222,8 @@
  *     new offset on success, or -1 if error occured (errno set
  *     appropriately).
  */
-rtems_off64_t
-msdos_file_lseek(rtems_libio_t *iop, rtems_off64_t offset, int whence)
+off_t        
+msdos_file_lseek(rtems_libio_t *iop, off_t offset, int whence)
 {
     int                rc = RC_OK;
     rtems_status_code  sc = RTEMS_SUCCESSFUL;
@@ -301,7 +301,7 @@
  *     RC_OK on success, or -1 if error occured (errno set appropriately).
  */
 int
-msdos_file_ftruncate(rtems_libio_t *iop, rtems_off64_t length)
+msdos_file_ftruncate(rtems_libio_t *iop, off_t length)
 {
     int                rc = RC_OK;
     rtems_status_code  sc = RTEMS_SUCCESSFUL;


 *ralf*:
2011-11-06      Ralf Corsépius <ralf.corsepius at 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.

M 1.2981  cpukit/ChangeLog
M   1.25  cpukit/libfs/src/imfs/deviceio.c
M   1.53  cpukit/libfs/src/imfs/imfs.h
M   1.30  cpukit/libfs/src/imfs/imfs_directory.c
M    1.9  cpukit/libfs/src/imfs/imfs_fifo.c
M   1.43  cpukit/libfs/src/imfs/memfile.c

diff -u rtems/cpukit/ChangeLog:1.2980 rtems/cpukit/ChangeLog:1.2981
--- rtems/cpukit/ChangeLog:1.2980	Sun Nov  6 05:54:48 2011
+++ rtems/cpukit/ChangeLog	Sun Nov  6 05:57:09 2011
@@ -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 at rtems.org>
 

diff -u rtems/cpukit/libfs/src/imfs/deviceio.c:1.24 rtems/cpukit/libfs/src/imfs/deviceio.c:1.25
--- rtems/cpukit/libfs/src/imfs/deviceio.c:1.24	Thu Jul 15 03:10:47 2010
+++ rtems/cpukit/libfs/src/imfs/deviceio.c	Sun Nov  6 05:57:10 2011
@@ -203,9 +203,9 @@
  *  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 @@
 
 int device_ftruncate(
   rtems_libio_t *iop,
-  rtems_off64_t  length
+  off_t          length
 )
 {
   return 0;

diff -u rtems/cpukit/libfs/src/imfs/imfs.h:1.52 rtems/cpukit/libfs/src/imfs/imfs.h:1.53
--- rtems/cpukit/libfs/src/imfs/imfs.h:1.52	Tue Oct 25 22:49:27 2011
+++ rtems/cpukit/libfs/src/imfs/imfs.h	Sun Nov  6 05:57:10 2011
@@ -102,14 +102,14 @@
 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 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 @@
   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 @@
   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 @@
   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(

diff -u rtems/cpukit/libfs/src/imfs/imfs_directory.c:1.29 rtems/cpukit/libfs/src/imfs/imfs_directory.c:1.30
--- rtems/cpukit/libfs/src/imfs/imfs_directory.c:1.29	Thu Jul 21 07:03:25 2011
+++ rtems/cpukit/libfs/src/imfs/imfs_directory.c	Sun Nov  6 05:57:10 2011
@@ -181,9 +181,9 @@
  *     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
 )
 {

diff -u rtems/cpukit/libfs/src/imfs/imfs_fifo.c:1.8 rtems/cpukit/libfs/src/imfs/imfs_fifo.c:1.9
--- rtems/cpukit/libfs/src/imfs/imfs_fifo.c:1.8	Wed Aug 25 04:37:48 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_fifo.c	Sun Nov  6 05:57:10 2011
@@ -116,9 +116,9 @@
   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
 )
 {

diff -u rtems/cpukit/libfs/src/imfs/memfile.c:1.42 rtems/cpukit/libfs/src/imfs/memfile.c:1.43
--- rtems/cpukit/libfs/src/imfs/memfile.c:1.42	Fri Oct  7 04:36:35 2011
+++ rtems/cpukit/libfs/src/imfs/memfile.c	Sun Nov  6 05:57:10 2011
@@ -201,9 +201,9 @@
  *
  *  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 @@
  */
 int memfile_ftruncate(
   rtems_libio_t        *iop,
-  rtems_off64_t         length
+  off_t                 length
 )
 {
   IMFS_jnode_t   *the_jnode;


 *ralf*:
2011-11-06      Ralf Corsépius <ralf.corsepius at 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.

M 1.2982  cpukit/ChangeLog
M   1.30  cpukit/libfs/src/nfsclient/src/nfs.c
M    1.6  cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c
M    1.9  cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c
M   1.12  cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c
M   1.38  cpukit/libnetworking/lib/ftpfs.c
M   1.42  cpukit/libnetworking/lib/tftpDriver.c

diff -u rtems/cpukit/ChangeLog:1.2981 rtems/cpukit/ChangeLog:1.2982
--- rtems/cpukit/ChangeLog:1.2981	Sun Nov  6 05:57:09 2011
+++ rtems/cpukit/ChangeLog	Sun Nov  6 06:00:03 2011
@@ -12,6 +12,10 @@
 	* 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.
+	* 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.
 
 2011-11-06      Ralf Corsépius <ralf.corsepius at rtems.org>
 

diff -u rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.29 rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.30
--- rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.29	Mon Aug  1 02:27:25 2011
+++ rtems/cpukit/libfs/src/nfsclient/src/nfs.c	Sun Nov  6 06:00:04 2011
@@ -2688,9 +2688,9 @@
 	return count;
 }
 
-static rtems_off64_t nfs_file_lseek(
+static off_t nfs_file_lseek(
 	rtems_libio_t *iop,
-	rtems_off64_t  length,
+	off_t          length,
 	int            whence
 )
 {
@@ -2721,9 +2721,9 @@
 	return iop->offset;
 }
 
-static rtems_off64_t nfs_dir_lseek(
+static off_t nfs_dir_lseek(
 	rtems_libio_t *iop,
-	rtems_off64_t  length,
+	off_t          length,
 	int            whence
 )
 {
@@ -2774,7 +2774,7 @@
 		uid_t         st_uid;
 		gid_t         st_gid;
 		dev_t         st_rdev;
-		rtems_off64_t st_size;
+		off_t         st_size;
 		/* SysV/sco doesn't have the rest... But Solaris, eabi does.  */
 #if defined(__svr4__) && !defined(__PPC__) && !defined(__sun__)
 		time_t        st_atime;
@@ -2958,7 +2958,7 @@
  */
 static int nfs_file_ftruncate(
 	rtems_libio_t *iop,
-	rtems_off64_t  length
+	off_t          length
 )
 {
 sattr					arg;

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c:1.5 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c:1.6
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c:1.5	Tue Mar 15 00:02:34 2011
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c	Sun Nov  6 06:00:04 2011
@@ -224,12 +224,12 @@
  * @param iop
  * @param offset
  * @param whence
- * @return rtems_off64_t
+ * @return off_t        
  */
 
-static rtems_off64_t
+static off_t        
 rtems_rfs_rtems_device_lseek (rtems_libio_t* iop,
-                              rtems_off64_t  offset,
+                              off_t          offset,
                               int            whence)
 {
   return offset;
@@ -244,7 +244,7 @@
  */
 
 static int
-rtems_rfs_rtems_device_ftruncate (rtems_libio_t* iop, rtems_off64_t length)
+rtems_rfs_rtems_device_ftruncate (rtems_libio_t* iop, off_t length)
 {
   return 0;
 }

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.8 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.9
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c:1.8	Tue Mar 15 00:02:34 2011
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c	Sun Nov  6 06:00:04 2011
@@ -171,11 +171,11 @@
  * @param iop
  * @param offset
  * @param whence
- * return rtems_off64_t
+ * return off_t        
  */
-static rtems_off64_t
+static off_t        
 rtems_rfs_rtems_dir_lseek (rtems_libio_t* iop,
-                           rtems_off64_t  offset,
+                           off_t          offset,
                            int            whence)
 {
   switch (whence)

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.11 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.12
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c:1.11	Tue Mar 15 02:32:39 2011
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c	Sun Nov  6 06:00:04 2011
@@ -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 @@
  * @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 @@
   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 @@
  */
 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));
   

diff -u rtems/cpukit/libnetworking/lib/ftpfs.c:1.37 rtems/cpukit/libnetworking/lib/ftpfs.c:1.38
--- rtems/cpukit/libnetworking/lib/ftpfs.c:1.37	Mon Jul 18 10:25:33 2011
+++ rtems/cpukit/libnetworking/lib/ftpfs.c	Sun Nov  6 06:00:04 2011
@@ -1149,7 +1149,7 @@
 }
 
 /* Dummy version to let fopen(*,"w") work properly */
-static int rtems_ftpfs_ftruncate(rtems_libio_t *iop, rtems_off64_t count)
+static int rtems_ftpfs_ftruncate(rtems_libio_t *iop, off_t count)
 {
   return 0;
 }

diff -u rtems/cpukit/libnetworking/lib/tftpDriver.c:1.41 rtems/cpukit/libnetworking/lib/tftpDriver.c:1.42
--- rtems/cpukit/libnetworking/lib/tftpDriver.c:1.41	Thu Jul  7 01:55:48 2011
+++ rtems/cpukit/libnetworking/lib/tftpDriver.c	Sun Nov  6 06:00:04 2011
@@ -1046,7 +1046,7 @@
  */
 static int rtems_tftp_ftruncate(
     rtems_libio_t   *iop __attribute__((unused)),
-    rtems_off64_t    count __attribute__((unused))
+    off_t            count __attribute__((unused))
 )
 {
     return 0;



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20111106/9cd9e257/attachment-0001.html>


More information about the vc mailing list