2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>

* libfs/src/nfsclient/src/nfs.c:
	Use uint32_t instead of u_int_t for readarg and writearg.
This commit is contained in:
Ralf Corsepius
2010-05-27 16:17:44 +00:00
parent bf0b23a48e
commit f74499291b
2 changed files with 16 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
2010-05-27 Ralf Corsépius <ralf.corsepius@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@rtems.org> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg. * libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg.

View File

@@ -384,16 +384,16 @@ typedef struct serporidok {
sattr attributes; sattr attributes;
} sattrarg; } sattrarg;
struct { struct {
u_int offset; uint32_t offset;
u_int count; uint32_t count;
u_int totalcount; uint32_t totalcount;
} readarg; } readarg;
struct { struct {
u_int beginoffset; uint32_t beginoffset;
u_int offset; uint32_t offset;
u_int totalcount; uint32_t totalcount;
struct { struct {
u_int data_len; uint32_t data_len;
char* data_val; char* data_val;
} data; } data;
} writearg; } writearg;
@@ -415,7 +415,7 @@ typedef struct serporidok {
} symlinkarg; } symlinkarg;
struct { struct {
nfscookie cookie; nfscookie cookie;
u_int count; uint32_t count;
} readdirarg; } readdirarg;
} arg_u; } arg_u;
} serporidok; } serporidok;
@@ -2599,7 +2599,7 @@ Nfs nfs = node->nfs;
SERP_ARGS(node).readarg.offset = iop->offset; SERP_ARGS(node).readarg.offset = iop->offset;
SERP_ARGS(node).readarg.count = count; 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; rr.readres_u.reply.data.data_val = buffer;
@@ -2702,7 +2702,7 @@ int e;
count = NFS_MAXDATA; count = NFS_MAXDATA;
SERP_ARGS(node).writearg.beginoffset = 0xdeadbeef; SERP_ARGS(node).writearg.beginoffset = UINT32_C(0xdeadbeef);
if ( LIBIO_FLAGS_APPEND & iop->flags ) { if ( LIBIO_FLAGS_APPEND & iop->flags ) {
if ( updateAttr(node, 0) ) { if ( updateAttr(node, 0) ) {
return -1; return -1;
@@ -2711,7 +2711,7 @@ int e;
} else { } else {
SERP_ARGS(node).writearg.offset = iop->offset; 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_len = count;
SERP_ARGS(node).writearg.data.data_val = (void*)buffer; SERP_ARGS(node).writearg.data.data_val = (void*)buffer;