change log for rtems (2010-05-27)

rtems-vc at rtems.org rtems-vc at rtems.org
Thu May 27 17:11:33 UTC 2010


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

	* libfs/src/nfsclient/src/nfs.c:
	Use uint32_t instead of u_int_t for readarg and writearg.

M 1.2319  cpukit/ChangeLog
M   1.20  cpukit/libfs/src/nfsclient/src/nfs.c

diff -u rtems/cpukit/ChangeLog:1.2318 rtems/cpukit/ChangeLog:1.2319
--- rtems/cpukit/ChangeLog:1.2318	Thu May 27 09:20:09 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:17:43 2010
@@ -1,5 +1,10 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/nfsclient/src/nfs.c: 
+	Use uint32_t instead of u_int_t for readarg and writearg.
+
+2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
+
 	* libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg.
 
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>

diff -u rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.19 rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.20
--- rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.19	Thu May 27 09:20:10 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/nfs.c	Thu May 27 11:17:44 2010
@@ -384,16 +384,16 @@
 			sattr		attributes;
 		}					sattrarg;
 		struct {
-			u_int 		offset;
-			u_int		count;
-			u_int		totalcount;
+			uint32_t	offset;
+			uint32_t	count;
+			uint32_t	totalcount;
 		}					readarg;
 		struct {
-			u_int		beginoffset;
-			u_int		offset;
-			u_int		totalcount;
+			uint32_t	beginoffset;
+			uint32_t	offset;
+			uint32_t	totalcount;
 			struct {
-				u_int data_len;
+				uint32_t data_len;
 				char* data_val;
 			}			data;
 		}					writearg;
@@ -415,7 +415,7 @@
 		}					symlinkarg;
 		struct {
 			nfscookie	cookie;
-			u_int		count;
+			uint32_t	count;
 		}					readdirarg;
 	}							arg_u;
 } serporidok;
@@ -2599,7 +2599,7 @@
 
 	SERP_ARGS(node).readarg.offset		= iop->offset;
 	SERP_ARGS(node).readarg.count	  	= count;
-	SERP_ARGS(node).readarg.totalcount	= 0xdeadbeef;
+	SERP_ARGS(node).readarg.totalcount	= UINT32_C(0xdeadbeef);
 
 	rr.readres_u.reply.data.data_val	= buffer;
 
@@ -2702,7 +2702,7 @@
 		count = NFS_MAXDATA;
 
 
-	SERP_ARGS(node).writearg.beginoffset   = 0xdeadbeef;
+	SERP_ARGS(node).writearg.beginoffset   = UINT32_C(0xdeadbeef);
 	if ( LIBIO_FLAGS_APPEND & iop->flags ) {
 		if ( updateAttr(node, 0) ) {
 			return -1;
@@ -2711,7 +2711,7 @@
 	} else {
 		SERP_ARGS(node).writearg.offset	  	   = iop->offset;
 	}
-	SERP_ARGS(node).writearg.totalcount	   = 0xdeadbeef;
+	SERP_ARGS(node).writearg.totalcount	   = UINT32_C(0xdeadbeef);
 	SERP_ARGS(node).writearg.data.data_len = count;
 	SERP_ARGS(node).writearg.data.data_val = (void*)buffer;
 


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

	* libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_eval.c:
	Use size_t instead of int for pathlen.

M 1.2320  cpukit/ChangeLog
M    1.6  cpukit/libfs/src/devfs/devfs.h
M    1.5  cpukit/libfs/src/devfs/devfs_eval.c

diff -u rtems/cpukit/ChangeLog:1.2319 rtems/cpukit/ChangeLog:1.2320
--- rtems/cpukit/ChangeLog:1.2319	Thu May 27 11:17:43 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:20:44 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_eval.c:
+	Use size_t instead of int for pathlen.
 	* libfs/src/nfsclient/src/nfs.c: 
 	Use uint32_t instead of u_int_t for readarg and writearg.
 

diff -u rtems/cpukit/libfs/src/devfs/devfs.h:1.5 rtems/cpukit/libfs/src/devfs/devfs.h:1.6
--- rtems/cpukit/libfs/src/devfs/devfs.h:1.5	Sun Nov 29 07:18:55 2009
+++ rtems/cpukit/libfs/src/devfs/devfs.h	Thu May 27 11:20:44 2010
@@ -195,7 +195,7 @@
 
 extern int devFS_evaluate_path(
   const char                        *pathname,
-  int                                pathnamelen,
+  size_t                             pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc
 );

diff -u rtems/cpukit/libfs/src/devfs/devfs_eval.c:1.4 rtems/cpukit/libfs/src/devfs/devfs_eval.c:1.5
--- rtems/cpukit/libfs/src/devfs/devfs_eval.c:1.4	Tue Aug 25 08:45:30 2009
+++ rtems/cpukit/libfs/src/devfs/devfs_eval.c	Thu May 27 11:20:44 2010
@@ -17,7 +17,7 @@
 
 int devFS_evaluate_path(
   const char                        *pathname,
-  int                                pathnamelen,
+  size_t                             pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc
 )


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

	* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_eval.c:
	Use size_t instead of int for pathnamelen.

M 1.2321  cpukit/ChangeLog
M   1.23  cpukit/libfs/src/dosfs/msdos.h
M   1.12  cpukit/libfs/src/dosfs/msdos_eval.c

diff -u rtems/cpukit/ChangeLog:1.2320 rtems/cpukit/ChangeLog:1.2321
--- rtems/cpukit/ChangeLog:1.2320	Thu May 27 11:20:44 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:23:04 2010
@@ -1,7 +1,9 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_eval.c:
+	Use size_t instead of int for pathnamelen.
 	* libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_eval.c:
-	Use size_t instead of int for pathlen.
+	Use size_t instead of int for pathnamelen.
 	* libfs/src/nfsclient/src/nfs.c: 
 	Use uint32_t instead of u_int_t for readarg and writearg.
 

diff -u rtems/cpukit/libfs/src/dosfs/msdos.h:1.22 rtems/cpukit/libfs/src/dosfs/msdos.h:1.23
--- rtems/cpukit/libfs/src/dosfs/msdos.h:1.22	Thu Mar  4 00:36:51 2010
+++ rtems/cpukit/libfs/src/dosfs/msdos.h	Thu May 27 11:23:04 2010
@@ -229,7 +229,7 @@
 
 int msdos_eval_path(
   const char                       *pathname,    /* IN */
-  int                               pathnamelen, /* IN */
+  size_t                            pathnamelen, /* IN */
   int                               flags,       /* IN */
   rtems_filesystem_location_info_t *pathloc      /* IN/OUT */
 );

diff -u rtems/cpukit/libfs/src/dosfs/msdos_eval.c:1.11 rtems/cpukit/libfs/src/dosfs/msdos_eval.c:1.12
--- rtems/cpukit/libfs/src/dosfs/msdos_eval.c:1.11	Thu Mar  4 00:36:51 2010
+++ rtems/cpukit/libfs/src/dosfs/msdos_eval.c	Thu May 27 11:23:04 2010
@@ -72,7 +72,7 @@
 int
 msdos_eval_path(
     const char                        *pathname,
-    int                                pathnamelen,
+    size_t                             pathnamelen,
     int                                flags,
     rtems_filesystem_location_info_t  *pathloc
     )


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

	* libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c:
	Use size_t instead of int for pathnamelen.

M 1.2322  cpukit/ChangeLog
M   1.40  cpukit/libfs/src/imfs/imfs.h
M   1.25  cpukit/libfs/src/imfs/imfs_eval.c

diff -u rtems/cpukit/ChangeLog:1.2321 rtems/cpukit/ChangeLog:1.2322
--- rtems/cpukit/ChangeLog:1.2321	Thu May 27 11:23:04 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:24:47 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c:
+	Use size_t instead of int for pathnamelen.
 	* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_eval.c:
 	Use size_t instead of int for pathnamelen.
 	* libfs/src/devfs/devfs.h, libfs/src/devfs/devfs_eval.c:

diff -u rtems/cpukit/libfs/src/imfs/imfs.h:1.39 rtems/cpukit/libfs/src/imfs/imfs.h:1.40
--- rtems/cpukit/libfs/src/imfs/imfs.h:1.39	Sat May 15 01:29:55 2010
+++ rtems/cpukit/libfs/src/imfs/imfs.h	Thu May 27 11:24:47 2010
@@ -324,7 +324,7 @@
 
 extern int IMFS_eval_path(
   const char                        *pathname,     /* IN     */
-  int                               pathnamelen,   /* IN     */
+  size_t                            pathnamelen,   /* IN     */
   int                               flags,         /* IN     */
   rtems_filesystem_location_info_t  *pathloc       /* IN/OUT */
 );

diff -u rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.24 rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.25
--- rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.24	Sun Nov 29 07:18:56 2009
+++ rtems/cpukit/libfs/src/imfs/imfs_eval.c	Thu May 27 11:24:47 2010
@@ -487,7 +487,7 @@
 
 int IMFS_eval_path(
   const char                        *pathname,     /* IN     */
-  int                                pathnamelen,  /* IN     */
+  size_t                             pathnamelen,  /* IN     */
   int                                flags,        /* IN     */
   rtems_filesystem_location_info_t  *pathloc       /* IN/OUT */
 )


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

	* libcsupport/include/rtems/libio_.h, libcsupport/src/eval.c:
	Use size_t instead of int for pathnamelen.

M 1.2323  cpukit/ChangeLog
M   1.33  cpukit/libcsupport/include/rtems/libio_.h
M   1.16  cpukit/libcsupport/src/eval.c

diff -u rtems/cpukit/ChangeLog:1.2322 rtems/cpukit/ChangeLog:1.2323
--- rtems/cpukit/ChangeLog:1.2322	Thu May 27 11:24:47 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:29:36 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libcsupport/include/rtems/libio_.h, libcsupport/src/eval.c:
+	Use size_t instead of int for pathnamelen.
 	* libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c:
 	Use size_t instead of int for pathnamelen.
 	* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_eval.c:

diff -u rtems/cpukit/libcsupport/include/rtems/libio_.h:1.32 rtems/cpukit/libcsupport/include/rtems/libio_.h:1.33
--- rtems/cpukit/libcsupport/include/rtems/libio_.h:1.32	Fri Apr 30 03:55:40 2010
+++ rtems/cpukit/libcsupport/include/rtems/libio_.h	Thu May 27 11:29:37 2010
@@ -246,7 +246,7 @@
 
 int rtems_filesystem_evaluate_relative_path(
   const char                        *pathname,
-  int                                pathnamelen,
+  size_t                             pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc,
   int                                follow_link
@@ -254,7 +254,7 @@
 
 int rtems_filesystem_evaluate_path(
   const char                        *pathname,
-  int                                pathnamelen,
+  size_t                             pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc,
   int                                follow_link

diff -u rtems/cpukit/libcsupport/src/eval.c:1.15 rtems/cpukit/libcsupport/src/eval.c:1.16
--- rtems/cpukit/libcsupport/src/eval.c:1.15	Thu Jun 11 21:59:18 2009
+++ rtems/cpukit/libcsupport/src/eval.c	Thu May 27 11:29:37 2010
@@ -23,13 +23,12 @@
 
 int rtems_filesystem_evaluate_relative_path(
   const char                        *pathname,
-  int                                pathnamelen,
+  size_t                             pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc,
   int                                follow_link
 )
 {
-  //int                           i;
   int                           result;
   rtems_filesystem_node_types_t type;
 
@@ -93,7 +92,7 @@
 
 int rtems_filesystem_evaluate_path(
   const char                        *pathname,
-  int                                pathnamelen,
+  size_t                             pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc,
   int                                follow_link


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

	* libcsupport/include/rtems/libio.h:
	Use size_t instead of int for pathnamelen.

M 1.2324  cpukit/ChangeLog
M   1.61  cpukit/libcsupport/include/rtems/libio.h

diff -u rtems/cpukit/ChangeLog:1.2323 rtems/cpukit/ChangeLog:1.2324
--- rtems/cpukit/ChangeLog:1.2323	Thu May 27 11:29:36 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:30:31 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libcsupport/include/rtems/libio.h:
+	Use size_t instead of int for pathnamelen.
 	* libcsupport/include/rtems/libio_.h, libcsupport/src/eval.c:
 	Use size_t instead of int for pathnamelen.
 	* libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c:

diff -u rtems/cpukit/libcsupport/include/rtems/libio.h:1.60 rtems/cpukit/libcsupport/include/rtems/libio.h:1.61
--- rtems/cpukit/libcsupport/include/rtems/libio.h:1.60	Thu Mar  4 00:36:50 2010
+++ rtems/cpukit/libcsupport/include/rtems/libio.h	Thu May 27 11:30:32 2010
@@ -176,7 +176,7 @@
 
 typedef int (*rtems_filesystem_evalpath_t)(
   const char                        *pathname,      /* IN     */
-  int                                pathnamelen,   /* IN     */
+  size_t                             pathnamelen,   /* IN     */
   int                                flags,         /* IN     */
   rtems_filesystem_location_info_t  *pathloc        /* IN/OUT */
 );


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

	* libfs/src/rfs/rtems-rfs-rtems.c:
	Use size_t instead of int for pathlen.
	Use %zi to print pathlen.

M 1.2325  cpukit/ChangeLog
M    1.7  cpukit/libfs/src/rfs/rtems-rfs-rtems.c

diff -u rtems/cpukit/ChangeLog:1.2324 rtems/cpukit/ChangeLog:1.2325
--- rtems/cpukit/ChangeLog:1.2324	Thu May 27 11:30:31 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:32:45 2010
@@ -1,5 +1,8 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/rfs/rtems-rfs-rtems.c:
+	Use size_t instead of int for pathlen.
+	Use %zi to print pathlen.
 	* libcsupport/include/rtems/libio.h:
 	Use size_t instead of int for pathnamelen.
 	* libcsupport/include/rtems/libio_.h, libcsupport/src/eval.c:

diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.6 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.7
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.6	Mon Apr 12 00:29:25 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c	Thu May 27 11:32:46 2010
@@ -58,7 +58,7 @@
  */
 int
 rtems_rfs_rtems_eval_path (const char*                       path,
-                           int                               pathlen,
+                           size_t                            pathlen,
                            int                               flags,
                            rtems_filesystem_location_info_t* pathloc)
 {
@@ -72,7 +72,7 @@
   int                    rc;
 
   if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
-    printf ("rtems-rfs-rtems: eval-path: in: path:%s pathlen:%i ino:%ld\n",
+    printf ("rtems-rfs-rtems: eval-path: in: path:%s pathlen:%zi ino:%ld\n",
             path, pathlen, ino);
   
   /*


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

	*  libnetworking/lib/ftpfs.c, libnetworking/lib/tftpDriver.c:
	Use size_t instead of int for pathnamelen.

M 1.2326  cpukit/ChangeLog
M   1.28  cpukit/libnetworking/lib/ftpfs.c
M   1.37  cpukit/libnetworking/lib/tftpDriver.c

diff -u rtems/cpukit/ChangeLog:1.2325 rtems/cpukit/ChangeLog:1.2326
--- rtems/cpukit/ChangeLog:1.2325	Thu May 27 11:32:45 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:36:01 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	*  libnetworking/lib/ftpfs.c, libnetworking/lib/tftpDriver.c:
+	Use size_t instead of int for pathnamelen.
 	* libfs/src/rfs/rtems-rfs-rtems.c:
 	Use size_t instead of int for pathlen.
 	Use %zi to print pathlen.

diff -u rtems/cpukit/libnetworking/lib/ftpfs.c:1.27 rtems/cpukit/libnetworking/lib/ftpfs.c:1.28
--- rtems/cpukit/libnetworking/lib/ftpfs.c:1.27	Fri Apr 30 03:52:29 2010
+++ rtems/cpukit/libnetworking/lib/ftpfs.c	Thu May 27 11:36:02 2010
@@ -1196,7 +1196,7 @@
 
 static int rtems_ftpfs_eval_path(
   const char *pathname,
-  int pathnamelen,
+  size_t pathnamelen,
   int flags,
   rtems_filesystem_location_info_t *pathloc
 )

diff -u rtems/cpukit/libnetworking/lib/tftpDriver.c:1.36 rtems/cpukit/libnetworking/lib/tftpDriver.c:1.37
--- rtems/cpukit/libnetworking/lib/tftpDriver.c:1.36	Sun Mar 28 00:44:42 2010
+++ rtems/cpukit/libnetworking/lib/tftpDriver.c	Thu May 27 11:36:02 2010
@@ -488,7 +488,7 @@
 
 static int rtems_tftp_eval_path(
   const char                        *pathname,     /* IN     */
-  int                                pathnamelen,  /* IN     */		
+  size_t                             pathnamelen,  /* IN     */		
   int                                flags,        /* IN     */
   rtems_filesystem_location_info_t  *pathloc       /* IN/OUT */
 )


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

	* libnetworking/rtems/rtems_mii_ioctl.h,
	libnetworking/rtems/rtems_mii_ioctl_kern.c:
	Use uint32_t instead of int as ioctl cmd arg.

M 1.2327  cpukit/ChangeLog
M    1.8  cpukit/libnetworking/rtems/rtems_mii_ioctl.h
M   1.10  cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c

diff -u rtems/cpukit/ChangeLog:1.2326 rtems/cpukit/ChangeLog:1.2327
--- rtems/cpukit/ChangeLog:1.2326	Thu May 27 11:36:01 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:38:50 2010
@@ -1,5 +1,11 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libnetworking/rtems/rtems_mii_ioctl.h, 
+	libnetworking/rtems/rtems_mii_ioctl_kern.c:
+	Use uint32_t instead of int as ioctl cmd arg.
+
+2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
+
 	*  libnetworking/lib/ftpfs.c, libnetworking/lib/tftpDriver.c:
 	Use size_t instead of int for pathnamelen.
 	* libfs/src/rfs/rtems-rfs-rtems.c:

diff -u rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl.h:1.7 rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl.h:1.8
--- rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl.h:1.7	Mon Nov 30 09:57:51 2009
+++ rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl.h	Thu May 27 11:38:51 2010
@@ -92,7 +92,7 @@
  *
  */
 int
-rtems_mii_ioctl (struct rtems_mdio_info *info, void *uarg, int cmd,
+rtems_mii_ioctl (struct rtems_mdio_info *info, void *uarg, uint32_t cmd,
                  int *media);
 
 #endif

diff -u rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c:1.9 rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c:1.10
--- rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c:1.9	Mon Nov 30 09:57:51 2009
+++ rtems/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c	Thu May 27 11:38:51 2010
@@ -84,12 +84,12 @@
 #endif
 
 int
-rtems_mii_ioctl (struct rtems_mdio_info *info, void *uarg, int cmd,
+rtems_mii_ioctl (struct rtems_mdio_info *info, void *uarg, uint32_t cmd,
                  int *media)
 {
   uint32_t bmcr, bmsr, aner, bmcr2 = 0, bmsr2 = 0, anar, lpar;
   int phy = IFM_INST (*media);
-  unsigned tmp;
+  uint32_t tmp;
   int subtype = 0, options = 0;
 
   switch (cmd) {


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

	* libnetworking/netinet/raw_ip.c,
	libnetworking/netinet/udp_usrreq.c:
	Cast mbufs to uintptr_t instead of u_long.

M 1.2328  cpukit/ChangeLog
M    1.9  cpukit/libnetworking/netinet/raw_ip.c
M   1.17  cpukit/libnetworking/netinet/udp_usrreq.c

diff -u rtems/cpukit/ChangeLog:1.2327 rtems/cpukit/ChangeLog:1.2328
--- rtems/cpukit/ChangeLog:1.2327	Thu May 27 11:38:50 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:45:14 2010
@@ -1,5 +1,8 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libnetworking/netinet/raw_ip.c,
+	libnetworking/netinet/udp_usrreq.c:
+	Cast mbufs to uintptr_t instead of u_long.
 	* libnetworking/rtems/rtems_mii_ioctl.h, 
 	libnetworking/rtems/rtems_mii_ioctl_kern.c:
 	Use uint32_t instead of int as ioctl cmd arg.

diff -u rtems/cpukit/libnetworking/netinet/raw_ip.c:1.8 rtems/cpukit/libnetworking/netinet/raw_ip.c:1.9
--- rtems/cpukit/libnetworking/netinet/raw_ip.c:1.8	Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/raw_ip.c	Thu May 27 11:45:14 2010
@@ -336,7 +336,7 @@
 	int s;
 
 	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)nam,
+		return (in_control(so, (uintptr_t)m, (caddr_t)nam,
 			(struct ifnet *)control));
 
 	switch (req) {

diff -u rtems/cpukit/libnetworking/netinet/udp_usrreq.c:1.16 rtems/cpukit/libnetworking/netinet/udp_usrreq.c:1.17
--- rtems/cpukit/libnetworking/netinet/udp_usrreq.c:1.16	Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/udp_usrreq.c	Thu May 27 11:45:15 2010
@@ -594,7 +594,7 @@
 	int s;
 
 	if (req == PRU_CONTROL)
-		return (in_control(so, (u_long)m, (caddr_t)addr,
+		return (in_control(so, (uintptr_t)m, (caddr_t)addr,
 			(struct ifnet *)control));
 	if (inp == NULL && req != PRU_ATTACH) {
 		error = EINVAL;


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

	* libfs/src/nfsclient/src/xdr_mbuf.c:
	Use void* arithmetic instead of u_long arithmetic.

M 1.2329  cpukit/ChangeLog
M    1.7  cpukit/libfs/src/nfsclient/src/xdr_mbuf.c

diff -u rtems/cpukit/ChangeLog:1.2328 rtems/cpukit/ChangeLog:1.2329
--- rtems/cpukit/ChangeLog:1.2328	Thu May 27 11:45:14 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:47:06 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libfs/src/nfsclient/src/xdr_mbuf.c:
+	Use void* arithmetic instead of u_long arithmetic.
 	* libnetworking/netinet/raw_ip.c,
 	libnetworking/netinet/udp_usrreq.c:
 	Cast mbufs to uintptr_t instead of u_long.

diff -u rtems/cpukit/libfs/src/nfsclient/src/xdr_mbuf.c:1.6 rtems/cpukit/libfs/src/nfsclient/src/xdr_mbuf.c:1.7
--- rtems/cpukit/libfs/src/nfsclient/src/xdr_mbuf.c:1.6	Fri Mar 26 23:04:39 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/xdr_mbuf.c	Thu May 27 11:47:06 2010
@@ -455,7 +455,7 @@
 u_int       rval = mbp->pos;
 
 	if (m) {
-		rval += (u_long)xdrs->x_private - mtod(m, u_long);
+		rval += xdrs->x_private - mtod(m, void*);
 	}
 #else
 struct mbuf *m;


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

	* libnetworking/libc/gethostnamadr.c:
	Try to make crazy address arithmetic more portable.

M 1.2330  cpukit/ChangeLog
M   1.14  cpukit/libnetworking/libc/gethostnamadr.c

diff -u rtems/cpukit/ChangeLog:1.2329 rtems/cpukit/ChangeLog:1.2330
--- rtems/cpukit/ChangeLog:1.2329	Thu May 27 11:47:06 2010
+++ rtems/cpukit/ChangeLog	Thu May 27 11:50:01 2010
@@ -1,5 +1,7 @@
 2010-05-27	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libnetworking/libc/gethostnamadr.c:
+	Try to make crazy address arithmetic more portable.
 	* libfs/src/nfsclient/src/xdr_mbuf.c:
 	Use void* arithmetic instead of u_long arithmetic.
 	* libnetworking/netinet/raw_ip.c,

diff -u rtems/cpukit/libnetworking/libc/gethostnamadr.c:1.13 rtems/cpukit/libnetworking/libc/gethostnamadr.c:1.14
--- rtems/cpukit/libnetworking/libc/gethostnamadr.c:1.13	Fri Mar 26 23:00:52 2010
+++ rtems/cpukit/libnetworking/libc/gethostnamadr.c	Thu May 27 11:50:01 2010
@@ -381,7 +381,7 @@
   strcpy(buf,name);
 
   result->h_addr_list=(char**)(buf+strlen(name)+1);
-  result->h_addr_list+=sizeof(unsigned long)-((unsigned long)(result->h_addr_list)&(sizeof(unsigned long)-1));
+  result->h_addr_list+=sizeof(char*)-((size_t)(result->h_addr_list)&(sizeof(char*)-1));
   result->h_addr_list[0]=(char*)&result->h_addr_list[2];
   if (inet_pton(AF_INET,name,result->h_addr_list[0])) {
     result->h_addrtype=AF_INET;



--

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/33a3de4e/attachment.html>


More information about the vc mailing list