change log for rtems (2010-05-27)

[rtems-vc at rtems.org]

 *ralf*:
2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
	NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.

M 1.2314  cpukit/ChangeLog
M   1.18  cpukit/libfs/src/nfsclient/src/nfs.c

diff -u rtems/cpukit/ChangeLog:1.2313 rtems/cpukit/ChangeLog:1.2314
--- rtems/cpukit/ChangeLog:1.2313	Thu May 27 02:41:51 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 04:42:14 2010
@@ -1,5 +1,10 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
+	NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.
+
+2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
+
 	* libfs/src/nfsclient/src/rpcio.c, libfs/src/nfsclient/src/rpcio.h:
 	Use rpcprog_t for "program args", use rpcvers_t for "version args".
 

diff -u rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.17 rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.18
--- rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.17	Fri Mar 12 10:26:14 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/nfs.c	Thu May 27 04:42:14 2010
@@ -157,14 +157,14 @@
 
 #define	NFS_MAKE_DEV_T_INO_HACK(node) \
 		rtems_filesystem_make_dev_t( NFS_MAJOR, \
-			(((node)->nfs->id)<<16) | (SERP_ATTR((node)).fileid >> 16) )
+			(((rtems_device_minor_number)((node)->nfs->id))<<16) | (((rtems_device_minor_number)SERP_ATTR((node)).fileid) >> 16) )
 
 /* use our 'nfs id' and the server's fsid for the minor device number
  * this should be fairly unique
  */
 #define	NFS_MAKE_DEV_T(node) \
 		rtems_filesystem_make_dev_t( NFS_MAJOR, \
-			(((node)->nfs->id)<<16) | (SERP_ATTR((node)).fsid & ((1<<16)-1)) )
+			(((rtems_device_minor_number)((node)->nfs->id))<<16) | (SERP_ATTR((node)).fsid & (((rtems_device_minor_number)1<<16)-1)) )
 
 #define  DIRENT_HEADER_SIZE ( sizeof(struct dirent) - \
 			sizeof( ((struct dirent *)0)->d_name ) )


 *ralf*:
2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libfs/src/nfsclient/src/rpcio.c:
	Cast pointers to uintptr_t instead of long.
	xids are uint32_t not u_long.

M 1.2315  cpukit/ChangeLog
M   1.12  cpukit/libfs/src/nfsclient/src/rpcio.c

diff -u rtems/cpukit/ChangeLog:1.2314 rtems/cpukit/ChangeLog:1.2315
--- rtems/cpukit/ChangeLog:1.2314	Thu May 27 04:42:14 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 04:44:43 2010
@@ -1,5 +1,8 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/nfsclient/src/rpcio.c: 
+	Cast pointers to uintptr_t instead of long.
+	xids are uint32_t not u_long.
 	* libfs/src/nfsclient/src/nfs.c (NFS_MAKE_DEV_T_INO_HACK,
 	NFS_MAKE_DEV_T): Cast "id"'s to rtems_device_minor_number.
 

diff -u rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.11 rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.12
--- rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.11	Thu May 27 02:41:51 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/rpcio.c	Thu May 27 04:44:43 2010
@@ -288,7 +288,7 @@
 } RpcUdpServerRec;
 
 typedef union  RpcBufU_ {
-		u_long				xid;
+		uint32_t			xid;
 		char				buf[1];
 } RpcBufU, *RpcBuf;
 
@@ -687,9 +687,9 @@
 			return 0;
 		}
 		/* pick a free table slot and initialize the XID */
-		rval->obuf.xid = time(0) ^ (unsigned long)rval;
+		rval->obuf.xid = time(0) ^ (uintptr_t)rval;
 		MU_LOCK(hlock);
-		rval->obuf.xid = (xidHashSeed++ ^ ((unsigned long)rval>>10)) & XACT_HASH_MSK;
+		rval->obuf.xid = (xidHashSeed++ ^ ((uintptr_t)rval>>10)) & XACT_HASH_MSK;
 		i=j=(rval->obuf.xid & XACT_HASH_MSK);
 		if (msgQ) {
 			/* if there's no message queue, refuse to



--

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/20100527/4c481fa2/attachment-0001.html>