change log for rtems (2010-06-18)
rtems-vc at rtems.org
rtems-vc at rtems.org
Fri Jun 18 10:11:48 UTC 2010
*ralf*:
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
M 1.2439 cpukit/ChangeLog
M 1.14 cpukit/libfs/src/nfsclient/src/rpcio.c
diff -u rtems/cpukit/ChangeLog:1.2438 rtems/cpukit/ChangeLog:1.2439
--- rtems/cpukit/ChangeLog:1.2438 Fri Jun 18 00:28:03 2010
+++ rtems/cpukit/ChangeLog Fri Jun 18 04:36:00 2010
@@ -1,5 +1,9 @@
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
+
+2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* rtems/include/rtems/rtems/object.h: Remove OBJECTS_ITRON_API.
* rtems/src/rtemsobjectidapimaximum.c: Remove OBJECTS_ITRON_API.
* score/include/rtems/score/object.h: Remove OBJECTS_ITRON_API.
diff -u rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.13 rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.14
--- rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.13 Sun May 30 05:18:41 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/rpcio.c Fri Jun 18 04:36:02 2010
@@ -65,6 +65,8 @@
#include "config.h"
#endif
+#include <inttypes.h>
+
#include <rtems.h>
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
@@ -1658,7 +1660,7 @@
sockRcv(void)
{
int len,i;
-u_long xid;
+uint32_t xid;
union {
struct sockaddr_in sin;
struct sockaddr sa;
@@ -1743,9 +1745,9 @@
#endif
} else {
fprintf(stderr,"RPCIO WARNING sockRcv(): transaction mismatch\n");
- fprintf(stderr,"xact: xid 0x%08lx -- got 0x%08lx\n",
+ fprintf(stderr,"xact: xid 0x%08" PRIx32 " -- got 0x%08" PRIx32 "\n",
xact->obuf.xid, xid);
- fprintf(stderr,"xact: addr 0x%08lx -- got 0x%08lx\n",
+ fprintf(stderr,"xact: addr 0x%08" PRIx32 " -- got 0x%08" PRIx32 "\n",
xact->server->addr.sin.sin_addr.s_addr,
fromAddr.sin.sin_addr.s_addr);
fprintf(stderr,"xact: port 0x%08x -- got 0x%08x\n",
@@ -1754,7 +1756,7 @@
}
} else {
fprintf(stderr,
- "RPCIO WARNING sockRcv(): got xid 0x%08lx but its slot is empty\n",
+ "RPCIO WARNING sockRcv(): got xid 0x%08" PRIx32 " but its slot is empty\n",
xid);
}
/* forget about this one and try again */
*ralf*:
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
M 1.2440 cpukit/ChangeLog
M 1.10 cpukit/libnetworking/netinet/if_ether.c
diff -u rtems/cpukit/ChangeLog:1.2439 rtems/cpukit/ChangeLog:1.2440
--- rtems/cpukit/ChangeLog:1.2439 Fri Jun 18 04:36:00 2010
+++ rtems/cpukit/ChangeLog Fri Jun 18 04:57:54 2010
@@ -1,5 +1,6 @@
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
diff -u rtems/cpukit/libnetworking/netinet/if_ether.c:1.9 rtems/cpukit/libnetworking/netinet/if_ether.c:1.10
--- rtems/cpukit/libnetworking/netinet/if_ether.c:1.9 Sun Mar 28 00:47:48 2010
+++ rtems/cpukit/libnetworking/netinet/if_ether.c Fri Jun 18 04:57:54 2010
@@ -111,7 +111,7 @@
&arp_proxyall, 0, "");
static void arp_rtrequest(int, struct rtentry *, struct sockaddr *);
-static void arprequest(struct arpcom *, u_long *, u_long *, u_char *);
+static void arprequest(struct arpcom *, struct in_addr *, struct in_addr *, u_char *);
void arpintr(void);
static void arptfree(struct llinfo_arp *);
static void arptimer(void *);
@@ -189,8 +189,8 @@
/* Announce a new entry if requested. */
if (rt->rt_flags & RTF_ANNOUNCE)
arprequest((struct arpcom *)rt->rt_ifp,
- &SIN(rt_key(rt))->sin_addr.s_addr,
- &SIN(rt_key(rt))->sin_addr.s_addr,
+ &SIN(rt_key(rt))->sin_addr,
+ &SIN(rt_key(rt))->sin_addr,
(u_char *)LLADDR(SDL(gate)));
/*FALLTHROUGH*/
case RTM_RESOLVE:
@@ -278,7 +278,7 @@
* - arp header source ethernet address
*/
static void
-arprequest(struct arpcom *ac, u_long *sip, u_long *tip, u_char *enaddr)
+arprequest(struct arpcom *ac, struct in_addr *sip, struct in_addr *tip, u_char *enaddr)
{
struct mbuf *m;
struct ether_header *eh;
@@ -375,8 +375,8 @@
rt->rt_expire = rtems_bsdnet_seconds_since_boot();
if (la->la_asked++ < arp_maxtries)
arprequest(ac,
- &(SIN(rt->rt_ifa->ifa_addr)->sin_addr.s_addr),
- &(SIN(dst)->sin_addr.s_addr),
+ &(SIN(rt->rt_ifa->ifa_addr)->sin_addr),
+ &(SIN(dst)->sin_addr),
ac->ac_enaddr);
else {
rt->rt_flags |= RTF_REJECT;
@@ -635,8 +635,8 @@
arp_ifinit(struct arpcom *ac, struct ifaddr *ifa)
{
if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
- arprequest(ac, &(IA_SIN(ifa)->sin_addr.s_addr),
- &(IA_SIN(ifa)->sin_addr.s_addr), ac->ac_enaddr);
+ arprequest(ac, &(IA_SIN(ifa)->sin_addr),
+ &(IA_SIN(ifa)->sin_addr), ac->ac_enaddr);
ifa->ifa_rtrequest = arp_rtrequest;
ifa->ifa_flags |= RTF_CLONING;
}
*ralf* (on branch rtems-4-10-branch):
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
M 1.2346.2.39 cpukit/ChangeLog
M 1.13.2.1 cpukit/libfs/src/nfsclient/src/rpcio.c
M 1.9.2.1 cpukit/libnetworking/netinet/if_ether.c
diff -u rtems/cpukit/ChangeLog:1.2346.2.38 rtems/cpukit/ChangeLog:1.2346.2.39
--- rtems/cpukit/ChangeLog:1.2346.2.38 Thu Jun 17 17:10:19 2010
+++ rtems/cpukit/ChangeLog Fri Jun 18 05:00:44 2010
@@ -1,3 +1,8 @@
+2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
+ * libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
+
2010-06-18 Chris Johns <chrisj at rtems.org>
* libfs/src/rfs/rtems-rfs-file-block.c: Clean up uint64_t
diff -u rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.13 rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.13.2.1
--- rtems/cpukit/libfs/src/nfsclient/src/rpcio.c:1.13 Sun May 30 05:18:41 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/rpcio.c Fri Jun 18 05:00:46 2010
@@ -65,6 +65,8 @@
#include "config.h"
#endif
+#include <inttypes.h>
+
#include <rtems.h>
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
@@ -1658,7 +1660,7 @@
sockRcv(void)
{
int len,i;
-u_long xid;
+uint32_t xid;
union {
struct sockaddr_in sin;
struct sockaddr sa;
@@ -1743,9 +1745,9 @@
#endif
} else {
fprintf(stderr,"RPCIO WARNING sockRcv(): transaction mismatch\n");
- fprintf(stderr,"xact: xid 0x%08lx -- got 0x%08lx\n",
+ fprintf(stderr,"xact: xid 0x%08" PRIx32 " -- got 0x%08" PRIx32 "\n",
xact->obuf.xid, xid);
- fprintf(stderr,"xact: addr 0x%08lx -- got 0x%08lx\n",
+ fprintf(stderr,"xact: addr 0x%08" PRIx32 " -- got 0x%08" PRIx32 "\n",
xact->server->addr.sin.sin_addr.s_addr,
fromAddr.sin.sin_addr.s_addr);
fprintf(stderr,"xact: port 0x%08x -- got 0x%08x\n",
@@ -1754,7 +1756,7 @@
}
} else {
fprintf(stderr,
- "RPCIO WARNING sockRcv(): got xid 0x%08lx but its slot is empty\n",
+ "RPCIO WARNING sockRcv(): got xid 0x%08" PRIx32 " but its slot is empty\n",
xid);
}
/* forget about this one and try again */
diff -u rtems/cpukit/libnetworking/netinet/if_ether.c:1.9 rtems/cpukit/libnetworking/netinet/if_ether.c:1.9.2.1
--- rtems/cpukit/libnetworking/netinet/if_ether.c:1.9 Sun Mar 28 00:47:48 2010
+++ rtems/cpukit/libnetworking/netinet/if_ether.c Fri Jun 18 05:00:46 2010
@@ -111,7 +111,7 @@
&arp_proxyall, 0, "");
static void arp_rtrequest(int, struct rtentry *, struct sockaddr *);
-static void arprequest(struct arpcom *, u_long *, u_long *, u_char *);
+static void arprequest(struct arpcom *, struct in_addr *, struct in_addr *, u_char *);
void arpintr(void);
static void arptfree(struct llinfo_arp *);
static void arptimer(void *);
@@ -189,8 +189,8 @@
/* Announce a new entry if requested. */
if (rt->rt_flags & RTF_ANNOUNCE)
arprequest((struct arpcom *)rt->rt_ifp,
- &SIN(rt_key(rt))->sin_addr.s_addr,
- &SIN(rt_key(rt))->sin_addr.s_addr,
+ &SIN(rt_key(rt))->sin_addr,
+ &SIN(rt_key(rt))->sin_addr,
(u_char *)LLADDR(SDL(gate)));
/*FALLTHROUGH*/
case RTM_RESOLVE:
@@ -278,7 +278,7 @@
* - arp header source ethernet address
*/
static void
-arprequest(struct arpcom *ac, u_long *sip, u_long *tip, u_char *enaddr)
+arprequest(struct arpcom *ac, struct in_addr *sip, struct in_addr *tip, u_char *enaddr)
{
struct mbuf *m;
struct ether_header *eh;
@@ -375,8 +375,8 @@
rt->rt_expire = rtems_bsdnet_seconds_since_boot();
if (la->la_asked++ < arp_maxtries)
arprequest(ac,
- &(SIN(rt->rt_ifa->ifa_addr)->sin_addr.s_addr),
- &(SIN(dst)->sin_addr.s_addr),
+ &(SIN(rt->rt_ifa->ifa_addr)->sin_addr),
+ &(SIN(dst)->sin_addr),
ac->ac_enaddr);
else {
rt->rt_flags |= RTF_REJECT;
@@ -635,8 +635,8 @@
arp_ifinit(struct arpcom *ac, struct ifaddr *ifa)
{
if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY)
- arprequest(ac, &(IA_SIN(ifa)->sin_addr.s_addr),
- &(IA_SIN(ifa)->sin_addr.s_addr), ac->ac_enaddr);
+ arprequest(ac, &(IA_SIN(ifa)->sin_addr),
+ &(IA_SIN(ifa)->sin_addr), ac->ac_enaddr);
ifa->ifa_rtrequest = arp_rtrequest;
ifa->ifa_flags |= RTF_CLONING;
}
*ralf* (on branch rtems-4-10-branch):
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/rtems/mkrootfs.h: doxygen cosmetics.
M 1.2441 cpukit/ChangeLog
M 1.2346.2.40 cpukit/ChangeLog
M 1.12 cpukit/libnetworking/rtems/mkrootfs.h
M 1.8.4.3 cpukit/libnetworking/rtems/mkrootfs.h
diff -u rtems/cpukit/ChangeLog:1.2440 rtems/cpukit/ChangeLog:1.2441
--- rtems/cpukit/ChangeLog:1.2440 Fri Jun 18 04:57:54 2010
+++ rtems/cpukit/ChangeLog Fri Jun 18 05:03:39 2010
@@ -1,5 +1,6 @@
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libnetworking/rtems/mkrootfs.h: doxygen cosmetics.
* libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
diff -u rtems/cpukit/ChangeLog:1.2346.2.39 rtems/cpukit/ChangeLog:1.2346.2.40
--- rtems/cpukit/ChangeLog:1.2346.2.39 Fri Jun 18 05:00:44 2010
+++ rtems/cpukit/ChangeLog Fri Jun 18 05:03:49 2010
@@ -1,5 +1,6 @@
2010-06-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libnetworking/rtems/mkrootfs.h: doxygen cosmetics.
* libnetworking/netinet/if_ether.c: Misc. 64bit fixes from FreeBSD.
* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
diff -u rtems/cpukit/libnetworking/rtems/mkrootfs.h:1.11 rtems/cpukit/libnetworking/rtems/mkrootfs.h:1.12
--- rtems/cpukit/libnetworking/rtems/mkrootfs.h:1.11 Wed Jun 16 08:50:23 2010
+++ rtems/cpukit/libnetworking/rtems/mkrootfs.h Fri Jun 18 05:03:40 2010
@@ -30,9 +30,16 @@
extern "C" {
#endif
-/*
+/**
* Appends the lines to the a file. Create the file
* and builds the path if it does not exist.
+ *
+ * @param file
+ * @param omode
+ * @param line_cnt
+ * @param lines
+ *
+ * @return 0 on success, -1 on error
*/
int
@@ -41,8 +48,14 @@
const int line_cnt,
const char **lines);
-/*
- * Helper for bulding an /etc/hosts file.
+/**
+ * @brief Helper for bulding an /etc/hosts file.
+ *
+ * @param cip
+ * @param cname
+ * @param dname
+ *
+ * @return 0 on success, -1 on error
*/
int
@@ -50,10 +63,12 @@
const char *cname,
const char *dname);
-/*
- * Create a few common directories, plus a :
+/**
+ * Create a few common directories, plus a:
* /etc/passwd, /etc/group, /etc/host.conf, and
* /etc/hosts file.
+ *
+ * @return 0 on success, -1 on error
*/
int
diff -u rtems/cpukit/libnetworking/rtems/mkrootfs.h:1.8.4.2 rtems/cpukit/libnetworking/rtems/mkrootfs.h:1.8.4.3
--- rtems/cpukit/libnetworking/rtems/mkrootfs.h:1.8.4.2 Wed Jun 16 08:52:04 2010
+++ rtems/cpukit/libnetworking/rtems/mkrootfs.h Fri Jun 18 05:03:49 2010
@@ -37,9 +37,16 @@
int
rtems_rootfs_mkdir (const char *path, mode_t omode);
-/*
+/**
* Appends the lines to the a file. Create the file
* and builds the path if it does not exist.
+ *
+ * @param file
+ * @param omode
+ * @param line_cnt
+ * @param lines
+ *
+ * @return 0 on success, -1 on error
*/
int
@@ -48,8 +55,14 @@
const int line_cnt,
const char **lines);
-/*
- * Helper for bulding an /etc/hosts file.
+/**
+ * @brief Helper for bulding an /etc/hosts file.
+ *
+ * @param cip
+ * @param cname
+ * @param dname
+ *
+ * @return 0 on success, -1 on error
*/
int
@@ -57,10 +70,12 @@
const char *cname,
const char *dname);
-/*
- * Create a few common directories, plus a :
+/**
+ * Create a few common directories, plus a:
* /etc/passwd, /etc/group, /etc/host.conf, and
* /etc/hosts file.
+ *
+ * @return 0 on success, -1 on error
*/
int
--
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/20100618/62836ada/attachment-0001.html>
More information about the vc
mailing list