change log for rtems (2010-06-15)

[rtems-vc at rtems.org]

 *ralf* (on branch rtems-4-10-branch):
2010-06-15	Ralf Corsépius <ralf.corsepius at rtems.org>

	* libnetworking/netinet/ip_fw.c, libnetworking/netinet/ip_input.c:
	Misc. 64bit-compatibility fixes.

M 1.2389  cpukit/ChangeLog
M 1.2346.2.14  cpukit/ChangeLog
M    1.6  cpukit/libnetworking/netinet/ip_fw.c
M 1.5.2.1  cpukit/libnetworking/netinet/ip_fw.c
M   1.13  cpukit/libnetworking/netinet/ip_input.c
M 1.12.2.1  cpukit/libnetworking/netinet/ip_input.c

diff -u rtems/cpukit/ChangeLog:1.2388 rtems/cpukit/ChangeLog:1.2389
--- rtems/cpukit/ChangeLog:1.2388	Tue Jun 15 00:42:27 2010
+++ rtems/cpukit/ChangeLog	Tue Jun 15 06:33:50 2010
@@ -1,5 +1,10 @@
 2010-06-15	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libnetworking/netinet/ip_fw.c, libnetworking/netinet/ip_input.c:
+	Misc. 64bit-compatibility fixes.
+
+2010-06-15	Ralf Corsépius <ralf.corsepius at rtems.org>
+
 	* libmisc/shell/print-ls.c, libmisc/shell/main_msdosfmt.c:
 	Include <inttypes.h>.
 	Misc. 64bit-compatibility fixes.

diff -u rtems/cpukit/ChangeLog:1.2346.2.13 rtems/cpukit/ChangeLog:1.2346.2.14
--- rtems/cpukit/ChangeLog:1.2346.2.13	Tue Jun 15 00:42:38 2010
+++ rtems/cpukit/ChangeLog	Tue Jun 15 06:33:59 2010
@@ -1,5 +1,10 @@
 2010-06-15	Ralf Corsépius <ralf.corsepius at rtems.org>
 
+	* libnetworking/netinet/ip_fw.c, libnetworking/netinet/ip_input.c:
+	Misc. 64bit-compatibility fixes.
+
+2010-06-15	Ralf Corsépius <ralf.corsepius at rtems.org>
+
 	* libmisc/shell/print-ls.c, libmisc/shell/main_msdosfmt.c:
 	Include <inttypes.h>.
 	Misc. 64bit-compatibility fixes.

diff -u rtems/cpukit/libnetworking/netinet/ip_fw.c:1.5 rtems/cpukit/libnetworking/netinet/ip_fw.c:1.6
--- rtems/cpukit/libnetworking/netinet/ip_fw.c:1.5	Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/ip_fw.c	Tue Jun 15 06:33:51 2010
@@ -78,7 +78,8 @@
 
 #define dprintf(a)	if (!fw_debug); else printf a
 
-#define print_ip(a)	 printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\
+#define print_ip(a)	 printf("%"PRId32".%"PRId32".%"PRId32".%"PRId32,\
+				 		  (ntohl(a.s_addr)>>24)&0xFF,\
 				 		  (ntohl(a.s_addr)>>16)&0xFF,\
 						  (ntohl(a.s_addr)>>8)&0xFF,\
 						  (ntohl(a.s_addr))&0xFF);

diff -u rtems/cpukit/libnetworking/netinet/ip_fw.c:1.5 rtems/cpukit/libnetworking/netinet/ip_fw.c:1.5.2.1
--- rtems/cpukit/libnetworking/netinet/ip_fw.c:1.5	Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/ip_fw.c	Tue Jun 15 06:34:00 2010
@@ -78,7 +78,8 @@
 
 #define dprintf(a)	if (!fw_debug); else printf a
 
-#define print_ip(a)	 printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\
+#define print_ip(a)	 printf("%"PRId32".%"PRId32".%"PRId32".%"PRId32,\
+				 		  (ntohl(a.s_addr)>>24)&0xFF,\
 				 		  (ntohl(a.s_addr)>>16)&0xFF,\
 						  (ntohl(a.s_addr)>>8)&0xFF,\
 						  (ntohl(a.s_addr))&0xFF);

diff -u rtems/cpukit/libnetworking/netinet/ip_input.c:1.12 rtems/cpukit/libnetworking/netinet/ip_input.c:1.13
--- rtems/cpukit/libnetworking/netinet/ip_input.c:1.12	Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/ip_input.c	Tue Jun 15 06:33:51 2010
@@ -1188,7 +1188,7 @@
 	*(mtod(m, struct in_addr *)) = *p--;
 #ifdef DIAGNOSTIC
 	if (ipprintfs)
-		printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr));
+		printf(" hops %"PRIx32, ntohl(mtod(m, struct in_addr *)->s_addr));
 #endif
 
 	/*
@@ -1208,7 +1208,7 @@
 	while (p >= ip_srcrt.route) {
 #ifdef DIAGNOSTIC
 		if (ipprintfs)
-			printf(" %lx", ntohl(q->s_addr));
+			printf(" %"PRIx32, ntohl(q->s_addr));
 #endif
 		*q++ = *p--;
 	}
@@ -1218,7 +1218,7 @@
 	*q = ip_srcrt.dst;
 #ifdef DIAGNOSTIC
 	if (ipprintfs)
-		printf(" %lx\n", ntohl(q->s_addr));
+		printf(" %"PRIx32"\n", ntohl(q->s_addr));
 #endif
 	return (m);
 }
@@ -1294,7 +1294,7 @@
 	dest = 0;
 #ifdef DIAGNOSTIC
 	if (ipprintfs)
-		printf("forward: src %lx dst %lx ttl %x\n",
+		printf("forward: src %"PRIx32" dst %"PRIx32" ttl %x\n",
 			ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl);
 #endif
 

diff -u rtems/cpukit/libnetworking/netinet/ip_input.c:1.12 rtems/cpukit/libnetworking/netinet/ip_input.c:1.12.2.1
--- rtems/cpukit/libnetworking/netinet/ip_input.c:1.12	Sun Mar 28 00:47:49 2010
+++ rtems/cpukit/libnetworking/netinet/ip_input.c	Tue Jun 15 06:34:00 2010
@@ -1188,7 +1188,7 @@
 	*(mtod(m, struct in_addr *)) = *p--;
 #ifdef DIAGNOSTIC
 	if (ipprintfs)
-		printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr));
+		printf(" hops %"PRIx32, ntohl(mtod(m, struct in_addr *)->s_addr));
 #endif
 
 	/*
@@ -1208,7 +1208,7 @@
 	while (p >= ip_srcrt.route) {
 #ifdef DIAGNOSTIC
 		if (ipprintfs)
-			printf(" %lx", ntohl(q->s_addr));
+			printf(" %"PRIx32, ntohl(q->s_addr));
 #endif
 		*q++ = *p--;
 	}
@@ -1218,7 +1218,7 @@
 	*q = ip_srcrt.dst;
 #ifdef DIAGNOSTIC
 	if (ipprintfs)
-		printf(" %lx\n", ntohl(q->s_addr));
+		printf(" %"PRIx32"\n", ntohl(q->s_addr));
 #endif
 	return (m);
 }
@@ -1294,7 +1294,7 @@
 	dest = 0;
 #ifdef DIAGNOSTIC
 	if (ipprintfs)
-		printf("forward: src %lx dst %lx ttl %x\n",
+		printf("forward: src %"PRIx32" dst %"PRIx32" ttl %x\n",
 			ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl);
 #endif
 



--

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/20100615/b92374f7/attachment-0001.html>