<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-11-06)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
PR1945/cpukit
* libcsupport/include/rtems/libio.h: Mark rtems_off64_t as
deprecated.
Replace rtems_off64_t with off_t.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2977&r2=text&tr2=1.2978&diff_format=h">M</a></td><td width='1%'>1.2978</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libcsupport/include/rtems/libio.h.diff?r1=text&tr1=1.81&r2=text&tr2=1.82&diff_format=h">M</a></td><td width='1%'>1.82</td><td width='100%'>cpukit/libcsupport/include/rtems/libio.h</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,5 +1,12 @@
</font> 2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ 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@rtems.org>
+
</font> * libfs/src/rfs/rtems-rfs-dir.c: Rename PRIdoff_t into PRIooff_t.
2011-11-04 Chris Johns <chrisj@rtems.org>
<font color='#006600'>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
</font><font color='#997700'>@@ -49,11 +49,7 @@
</font> * @{
*/
<font color='#880000'>-/**
- * A 64-bit file offset for internal use by RTEMS. Based on the Newlib
- * type.
- */
-typedef _off64_t rtems_off64_t;
</font><font color='#000088'>+typedef off_t rtems_off64_t __attribute__((deprecated));
</font>
/**
* @brief File system node types.
<font color='#997700'>@@ -126,9 +122,9 @@
</font> * This type defines the interface to the lseek(2) system call<span style="background-color: #FF0000"> </span>
* support which is provided by a file system implementation.
*/
<font color='#880000'>-typedef rtems_off64_t (*rtems_filesystem_lseek_t)(
</font><font color='#000088'>+typedef off_t (*rtems_filesystem_lseek_t)(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length,
</font><font color='#000088'>+ off_t length,
</font> int whence
);
<font color='#997700'>@@ -156,7 +152,7 @@
</font> */
typedef int (*rtems_filesystem_ftruncate_t)(
rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length
</font><font color='#000088'>+ off_t length
</font> );
/**
<font color='#997700'>@@ -417,9 +413,9 @@
</font> * This method defines the interface to the default lseek(2) system call<span style="background-color: #FF0000"> </span>
* support which is provided by a file system implementation.
*/
<font color='#880000'>-rtems_off64_t rtems_filesystem_default_lseek(
</font><font color='#000088'>+off_t rtems_filesystem_default_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length,
</font><font color='#000088'>+ off_t length,
</font> int whence
);
<font color='#997700'>@@ -447,7 +443,7 @@
</font> */
int rtems_filesystem_default_ftruncate(
rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length
</font><font color='#000088'>+ off_t length
</font> );
/**
<font color='#997700'>@@ -1112,8 +1108,8 @@
</font> */
struct rtems_libio_tt {
rtems_driver_name_t *driver;
<font color='#880000'>- rtems_off64_t size; /* size of file */
- rtems_off64_t offset; /* current offset into file */
</font><font color='#000088'>+ off_t size; /* size of file */
+ off_t offset; /* current offset into file */
</font> uint32_t flags;
rtems_filesystem_location_info_t pathinfo;
rtems_id sem;
<font color='#997700'>@@ -1129,7 +1125,7 @@
</font> */
typedef struct {
rtems_libio_t *iop;
<font color='#880000'>- rtems_off64_t offset;
</font><font color='#000088'>+ off_t offset;
</font> char *buffer;
uint32_t count;
uint32_t flags;
<font color='#997700'>@@ -1208,9 +1204,9 @@
</font> void *buffer
);
<font color='#880000'>-typedef rtems_off64_t (*rtems_libio_lseek_t)(
</font><font color='#000088'>+typedef off_t (*rtems_libio_lseek_t)(
</font> int fd,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence
);
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
PR1945/cpukit
* libfs/src/defaults/default_ftruncate.c,
libfs/src/defaults/default_lseek.c:
Replace rtems_off64_t with off_t.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2978&r2=text&tr2=1.2979&diff_format=h">M</a></td><td width='1%'>1.2979</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/defaults/default_ftruncate.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/libfs/src/defaults/default_ftruncate.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/defaults/default_lseek.c.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>cpukit/libfs/src/defaults/default_lseek.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -4,6 +4,9 @@
</font> * libcsupport/include/rtems/libio.h: Mark rtems_off64_t as
deprecated.
Replace rtems_off64_t with off_t.
<font color='#000088'>+ * libfs/src/defaults/default_ftruncate.c,<span style="background-color: #FF0000"> </span>
+ libfs/src/defaults/default_lseek.c:
+ Replace rtems_off64_t with off_t.
</font>
2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#006600'>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
</font><font color='#997700'>@@ -15,7 +15,7 @@
</font>
int rtems_filesystem_default_ftruncate(
rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length
</font><font color='#000088'>+ off_t length
</font> )
{
rtems_set_errno_and_return_minus_one( ENOTSUP );
<font color='#006600'>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
</font><font color='#997700'>@@ -13,9 +13,9 @@
</font> #include <rtems/libio_.h>
#include <rtems/seterr.h>
<font color='#880000'>-rtems_off64_t rtems_filesystem_default_lseek(
</font><font color='#000088'>+off_t rtems_filesystem_default_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length,
</font><font color='#000088'>+ off_t length,
</font> int whence
)
{
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-11-06 Ralf Corsépius <ralf.corsepius@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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2979&r2=text&tr2=1.2980&diff_format=h">M</a></td><td width='1%'>1.2980</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/dosfs/msdos.h.diff?r1=text&tr1=1.27&r2=text&tr2=1.28&diff_format=h">M</a></td><td width='1%'>1.28</td><td width='100%'>cpukit/libfs/src/dosfs/msdos.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/dosfs/msdos_dir.c.diff?r1=text&tr1=1.21&r2=text&tr2=1.22&diff_format=h">M</a></td><td width='1%'>1.22</td><td width='100%'>cpukit/libfs/src/dosfs/msdos_dir.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/dosfs/msdos_file.c.diff?r1=text&tr1=1.16&r2=text&tr2=1.17&diff_format=h">M</a></td><td width='1%'>1.17</td><td width='100%'>cpukit/libfs/src/dosfs/msdos_file.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -7,6 +7,9 @@
</font> * libfs/src/defaults/default_ftruncate.c,<span style="background-color: #FF0000"> </span>
libfs/src/defaults/default_lseek.c:
Replace rtems_off64_t with off_t.
<font color='#000088'>+ * libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_dir.c,
+ libfs/src/dosfs/msdos_file.c:
+ Replace rtems_off64_t with off_t.
</font>
2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#006600'>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
</font><font color='#997700'>@@ -291,9 +291,9 @@
</font> size_t count /* IN */
);
<font color='#880000'>-rtems_off64_t msdos_file_lseek(
</font><font color='#000088'>+off_t msdos_file_lseek(
</font> rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t offset, /* IN */
</font><font color='#000088'>+ off_t offset, /* IN */
</font> int whence /* IN */
);
<font color='#997700'>@@ -305,7 +305,7 @@
</font> int
msdos_file_ftruncate(
rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t length /* IN */
</font><font color='#000088'>+ off_t length /* IN */
</font> );
int msdos_file_sync(rtems_libio_t *iop);
<font color='#997700'>@@ -342,9 +342,9 @@
</font> size_t count /* IN */
);
<font color='#880000'>-rtems_off64_t msdos_dir_lseek(
</font><font color='#000088'>+off_t msdos_dir_lseek(
</font> rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t offset, /* IN */
</font><font color='#000088'>+ off_t offset, /* IN */
</font> int whence /* IN */
);
<font color='#006600'>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
</font><font color='#997700'>@@ -497,8 +497,8 @@
</font> * RC_OK on success, or -1 if error occured (errno
* set apropriately).
*/
<font color='#880000'>-rtems_off64_t
-msdos_dir_lseek(rtems_libio_t *iop, rtems_off64_t offset, int whence)
</font><font color='#000088'>+off_t<span style="background-color: #FF0000"> </span>
+msdos_dir_lseek(rtems_libio_t *iop, off_t offset, int whence)
</font> {
switch (whence)
{
<font color='#006600'>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
</font><font color='#997700'>@@ -222,8 +222,8 @@
</font> * new offset on success, or -1 if error occured (errno set
* appropriately).
*/
<font color='#880000'>-rtems_off64_t
-msdos_file_lseek(rtems_libio_t *iop, rtems_off64_t offset, int whence)
</font><font color='#000088'>+off_t<span style="background-color: #FF0000"> </span>
+msdos_file_lseek(rtems_libio_t *iop, off_t offset, int whence)
</font> {
int rc = RC_OK;
rtems_status_code sc = RTEMS_SUCCESSFUL;
<font color='#997700'>@@ -301,7 +301,7 @@
</font> * RC_OK on success, or -1 if error occured (errno set appropriately).
*/
int
<font color='#880000'>-msdos_file_ftruncate(rtems_libio_t *iop, rtems_off64_t length)
</font><font color='#000088'>+msdos_file_ftruncate(rtems_libio_t *iop, off_t length)
</font> {
int rc = RC_OK;
rtems_status_code sc = RTEMS_SUCCESSFUL;
</pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2980&r2=text&tr2=1.2981&diff_format=h">M</a></td><td width='1%'>1.2981</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/deviceio.c.diff?r1=text&tr1=1.24&r2=text&tr2=1.25&diff_format=h">M</a></td><td width='1%'>1.25</td><td width='100%'>cpukit/libfs/src/imfs/deviceio.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/imfs.h.diff?r1=text&tr1=1.52&r2=text&tr2=1.53&diff_format=h">M</a></td><td width='1%'>1.53</td><td width='100%'>cpukit/libfs/src/imfs/imfs.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/imfs_directory.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>cpukit/libfs/src/imfs/imfs_directory.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/imfs_fifo.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>cpukit/libfs/src/imfs/imfs_fifo.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/imfs/memfile.c.diff?r1=text&tr1=1.42&r2=text&tr2=1.43&diff_format=h">M</a></td><td width='1%'>1.43</td><td width='100%'>cpukit/libfs/src/imfs/memfile.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -8,8 +8,10 @@
</font> libfs/src/defaults/default_lseek.c:
Replace rtems_off64_t with off_t.
* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_dir.c,
<font color='#880000'>- libfs/src/dosfs/msdos_file.c:
- Replace rtems_off64_t with off_t.
</font><font color='#000088'>+ 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.
</font>
2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#006600'>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
</font><font color='#997700'>@@ -203,9 +203,9 @@
</font> * writes fail.
*/
<font color='#880000'>-rtems_off64_t device_lseek(
</font><font color='#000088'>+off_t device_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence
)
{
<font color='#997700'>@@ -226,7 +226,7 @@
</font>
int device_ftruncate(
rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length
</font><font color='#000088'>+ off_t length
</font> )
{
return 0;
<font color='#006600'>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
</font><font color='#997700'>@@ -102,14 +102,14 @@
</font> typedef block_p *block_ptr;
typedef struct {
<font color='#880000'>- rtems_off64_t size; /* size of file in bytes */
</font><font color='#000088'>+ off_t size; /* size of file in bytes */
</font> 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 {
<font color='#880000'>- rtems_off64_t size; /* size of file in bytes */
</font><font color='#000088'>+ off_t size; /* size of file in bytes */
</font> block_p direct; /* pointer to file image */
} IMFS_linearfile_t;
<font color='#997700'>@@ -407,7 +407,7 @@
</font>
extern int memfile_ftruncate(
rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t length /* IN */
</font><font color='#000088'>+ off_t length /* IN */
</font> );
extern int imfs_dir_open(
<font color='#997700'>@@ -427,9 +427,9 @@
</font> size_t count /* IN */
);
<font color='#880000'>-extern rtems_off64_t imfs_dir_lseek(
</font><font color='#000088'>+extern off_t imfs_dir_lseek(
</font> rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t offset, /* IN */
</font><font color='#000088'>+ off_t offset, /* IN */
</font> int whence /* IN */
);
<font color='#997700'>@@ -472,9 +472,9 @@
</font> void *buffer /* IN */
);
<font color='#880000'>-extern rtems_off64_t memfile_lseek(
</font><font color='#000088'>+extern off_t memfile_lseek(
</font> rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t offset, /* IN */
</font><font color='#000088'>+ off_t offset, /* IN */
</font> int whence /* IN */
);
<font color='#997700'>@@ -507,15 +507,15 @@
</font> void *buffer /* IN */
);
<font color='#880000'>-extern rtems_off64_t device_lseek(
</font><font color='#000088'>+extern off_t device_lseek(
</font> rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t offset, /* IN */
</font><font color='#000088'>+ off_t offset, /* IN */
</font> int whence /* IN */
);
extern int device_ftruncate(
rtems_libio_t *iop, /* IN */
<font color='#880000'>- rtems_off64_t length /* IN */
</font><font color='#000088'>+ off_t length /* IN */
</font> );
extern int IMFS_utime(
<font color='#006600'>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
</font><font color='#997700'>@@ -181,9 +181,9 @@
</font> * SEEK_END - N/A --> This will cause an EINVAL to be returned.
*/
<font color='#880000'>-rtems_off64_t imfs_dir_lseek(
</font><font color='#000088'>+off_t imfs_dir_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence
)
{
<font color='#006600'>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
</font><font color='#997700'>@@ -116,9 +116,9 @@
</font> IMFS_FIFO_RETURN(err);
}
<font color='#880000'>-rtems_off64_t IMFS_fifo_lseek(
</font><font color='#000088'>+off_t IMFS_fifo_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence
)
{
<font color='#006600'>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
</font><font color='#997700'>@@ -201,9 +201,9 @@
</font> *
* This routine processes the lseek() system call.
*/
<font color='#880000'>-rtems_off64_t memfile_lseek(
</font><font color='#000088'>+off_t memfile_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence
)
{
<font color='#997700'>@@ -237,7 +237,7 @@
</font> */
int memfile_ftruncate(
rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length
</font><font color='#000088'>+ off_t length
</font> )
{
IMFS_jnode_t *the_jnode;
</pre>
<p> </p>
<a name='cs5'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2981&r2=text&tr2=1.2982&diff_format=h">M</a></td><td width='1%'>1.2982</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/nfsclient/src/nfs.c.diff?r1=text&tr1=1.29&r2=text&tr2=1.30&diff_format=h">M</a></td><td width='1%'>1.30</td><td width='100%'>cpukit/libfs/src/nfsclient/src/nfs.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c.diff?r1=text&tr1=1.5&r2=text&tr2=1.6&diff_format=h">M</a></td><td width='1%'>1.6</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-rtems-dev.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-rtems-dir.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-rtems-file.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/lib/ftpfs.c.diff?r1=text&tr1=1.37&r2=text&tr2=1.38&diff_format=h">M</a></td><td width='1%'>1.38</td><td width='100%'>cpukit/libnetworking/lib/ftpfs.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libnetworking/lib/tftpDriver.c.diff?r1=text&tr1=1.41&r2=text&tr2=1.42&diff_format=h">M</a></td><td width='1%'>1.42</td><td width='100%'>cpukit/libnetworking/lib/tftpDriver.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -12,6 +12,10 @@
</font> * 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.
<font color='#000088'>+ * 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.
</font>
2011-11-06 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#006600'>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
</font><font color='#997700'>@@ -2688,9 +2688,9 @@
</font> return count;
}
<font color='#880000'>-static rtems_off64_t nfs_file_lseek(
</font><font color='#000088'>+static off_t nfs_file_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length,
</font><font color='#000088'>+ off_t length,
</font> int whence
)
{
<font color='#997700'>@@ -2721,9 +2721,9 @@
</font> return iop->offset;
}
<font color='#880000'>-static rtems_off64_t nfs_dir_lseek(
</font><font color='#000088'>+static off_t nfs_dir_lseek(
</font> rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length,
</font><font color='#000088'>+ off_t length,
</font> int whence
)
{
<font color='#997700'>@@ -2774,7 +2774,7 @@
</font> uid_t st_uid;
gid_t st_gid;
dev_t st_rdev;
<font color='#880000'>- rtems_off64_t st_size;
</font><font color='#000088'>+ off_t st_size;
</font> /* SysV/sco doesn't have the rest... But Solaris, eabi does. */
#if defined(__svr4__) && !defined(__PPC__) && !defined(__sun__)
time_t st_atime;
<font color='#997700'>@@ -2958,7 +2958,7 @@
</font> */
static int nfs_file_ftruncate(
rtems_libio_t *iop,
<font color='#880000'>- rtems_off64_t length
</font><font color='#000088'>+ off_t length
</font> )
{
sattr arg;
<font color='#006600'>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
</font><font color='#997700'>@@ -224,12 +224,12 @@
</font> * @param iop
* @param offset
* @param whence
<font color='#880000'>- * @return rtems_off64_t
</font><font color='#000088'>+ * @return off_t<span style="background-color: #FF0000"> </span>
</font> */
<font color='#880000'>-static rtems_off64_t
</font><font color='#000088'>+static off_t<span style="background-color: #FF0000"> </span>
</font> rtems_rfs_rtems_device_lseek (rtems_libio_t* iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence)
{
return offset;
<font color='#997700'>@@ -244,7 +244,7 @@
</font> */
static int
<font color='#880000'>-rtems_rfs_rtems_device_ftruncate (rtems_libio_t* iop, rtems_off64_t length)
</font><font color='#000088'>+rtems_rfs_rtems_device_ftruncate (rtems_libio_t* iop, off_t length)
</font> {
return 0;
}
<font color='#006600'>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
</font><font color='#997700'>@@ -171,11 +171,11 @@
</font> * @param iop
* @param offset
* @param whence
<font color='#880000'>- * return rtems_off64_t
</font><font color='#000088'>+ * return off_t<span style="background-color: #FF0000"> </span>
</font> */
<font color='#880000'>-static rtems_off64_t
</font><font color='#000088'>+static off_t<span style="background-color: #FF0000"> </span>
</font> rtems_rfs_rtems_dir_lseek (rtems_libio_t* iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence)
{
switch (whence)
<font color='#006600'>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
</font><font color='#997700'>@@ -24,6 +24,14 @@
</font>
#include <inttypes.h>
<font color='#000088'>+#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
+
</font> #include <rtems/rfs/rtems-rfs-file.h>
#include "rtems-rfs-rtems.h"
<font color='#997700'>@@ -272,11 +280,11 @@
</font> * @param iop
* @param offset
* @param whence
<font color='#880000'>- * @return rtems_off64_t
</font><font color='#000088'>+ * @return off_t<span style="background-color: #FF0000"> </span>
</font> */
<font color='#880000'>-static rtems_off64_t
</font><font color='#000088'>+static off_t<span style="background-color: #FF0000"> </span>
</font> rtems_rfs_rtems_file_lseek (rtems_libio_t* iop,
<font color='#880000'>- rtems_off64_t offset,
</font><font color='#000088'>+ off_t offset,
</font> int whence)
{
rtems_rfs_file_handle* file = rtems_rfs_rtems_get_iop_file_handle (iop);
<font color='#997700'>@@ -284,7 +292,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FILE_LSEEK))
<font color='#880000'>- printf("rtems-rfs: file-lseek: handle:%p offset:%Ld\n", file, offset);
</font><font color='#000088'>+ printf("rtems-rfs: file-lseek: handle:%p offset:%" PRIdoff_t "\n", file, offset);
</font>
rtems_rfs_rtems_lock (rtems_rfs_file_fs (file));
<font color='#997700'>@@ -311,13 +319,13 @@
</font> */
static int
rtems_rfs_rtems_file_ftruncate (rtems_libio_t* iop,
<font color='#880000'>- rtems_off64_t length)
</font><font color='#000088'>+ off_t length)
</font> {
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))
<font color='#880000'>- printf("rtems-rfs: file-ftrunc: handle:%p length:%Ld\n", file, length);
</font><font color='#000088'>+ printf("rtems-rfs: file-ftrunc: handle:%p length:%" PRIdoff_t "\n", file, length);
</font>
rtems_rfs_rtems_lock (rtems_rfs_file_fs (file));
<font color='#006600'>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
</font><font color='#997700'>@@ -1149,7 +1149,7 @@
</font> }
/* Dummy version to let fopen(*,"w") work properly */
<font color='#880000'>-static int rtems_ftpfs_ftruncate(rtems_libio_t *iop, rtems_off64_t count)
</font><font color='#000088'>+static int rtems_ftpfs_ftruncate(rtems_libio_t *iop, off_t count)
</font> {
return 0;
}
<font color='#006600'>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
</font><font color='#997700'>@@ -1046,7 +1046,7 @@
</font> */
static int rtems_tftp_ftruncate(
rtems_libio_t *iop __attribute__((unused)),
<font color='#880000'>- rtems_off64_t count __attribute__((unused))
</font><font color='#000088'>+ off_t count __attribute__((unused))
</font> )
{
return 0;
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>