2010-06-18 Ralf Corsépius <ralf.corsepius@rtems.org>

* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
This commit is contained in:
Ralf Corsepius
2010-06-18 09:36:02 +00:00
parent c86cc72204
commit 70611700ff
2 changed files with 10 additions and 4 deletions

View File

@@ -1,3 +1,7 @@
2010-06-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/rpcio.c: Misc. 64bit fixes.
2010-06-18 Ralf Corsépius <ralf.corsepius@rtems.org> 2010-06-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* rtems/include/rtems/rtems/object.h: Remove OBJECTS_ITRON_API. * rtems/include/rtems/rtems/object.h: Remove OBJECTS_ITRON_API.

View File

@@ -65,6 +65,8 @@
#include "config.h" #include "config.h"
#endif #endif
#include <inttypes.h>
#include <rtems.h> #include <rtems.h>
#include <rtems/error.h> #include <rtems/error.h>
#include <rtems/rtems_bsdnet.h> #include <rtems/rtems_bsdnet.h>
@@ -1658,7 +1660,7 @@ static RpcUdpXact
sockRcv(void) sockRcv(void)
{ {
int len,i; int len,i;
u_long xid; uint32_t xid;
union { union {
struct sockaddr_in sin; struct sockaddr_in sin;
struct sockaddr sa; struct sockaddr sa;
@@ -1743,9 +1745,9 @@ RpcUdpXact xact = 0;
#endif #endif
} else { } else {
fprintf(stderr,"RPCIO WARNING sockRcv(): transaction mismatch\n"); 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); 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, xact->server->addr.sin.sin_addr.s_addr,
fromAddr.sin.sin_addr.s_addr); fromAddr.sin.sin_addr.s_addr);
fprintf(stderr,"xact: port 0x%08x -- got 0x%08x\n", fprintf(stderr,"xact: port 0x%08x -- got 0x%08x\n",
@@ -1754,7 +1756,7 @@ RpcUdpXact xact = 0;
} }
} else { } else {
fprintf(stderr, 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); xid);
} }
/* forget about this one and try again */ /* forget about this one and try again */