diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-27 14:20:10 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-27 14:20:10 +0000 |
| commit | bf0b23a48e77c55f6fe2e87efda4530bffdb6e0b (patch) | |
| tree | 6ab0e800f149812aa463a7e2555d5d7b9e5f7bdb /cpukit | |
| parent | 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-bf0b23a48e77c55f6fe2e87efda4530bffdb6e0b.tar.bz2 | |
2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/libfs/src/nfsclient/src/nfs.c | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ed39d4854e..f430dc44b1 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,9 @@ 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg. + +2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org> + * librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c: Revert to using u_long instead of rpcprog_t, rpcvers_t to stay bug-ward compatible to freebsd. diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c index 9ea63e54ee..e7473a7620 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -1353,10 +1353,15 @@ struct rtems_filesystem_location_info_tt * */ +union nfs_evalpath_arg { + int i; + const char **c; + }; + STATIC int nfs_do_evalpath( const char *pathname, /* IN */ int pathnamelen, /* IN */ - void *arg, + union nfs_evalpath_arg *arg, rtems_filesystem_location_info_t *pathloc, /* IN/OUT */ int forMake ) @@ -1510,9 +1515,9 @@ unsigned long niu,siu; #endif if (forMake) - rval = pathloc->ops->evalformake_h(part, pathloc, (const char**)arg); + rval = pathloc->ops->evalformake_h(part, pathloc, arg->c); else - rval = pathloc->ops->evalpath_h(part, strlen(part), (int)arg, pathloc); + rval = pathloc->ops->evalpath_h(part, strlen(part), arg->i, pathloc); free(p); return rval; @@ -1669,17 +1674,22 @@ static int nfs_evalformake( const char **pname /* OUT */ ) { - return nfs_do_evalpath(path, strlen(path), (void*)pname, pathloc, 1 /*forMake*/); + union nfs_evalpath_arg args; + args.c = pname; + + return nfs_do_evalpath(path, strlen(path), &args, pathloc, 1 /*forMake*/); } static int nfs_evalpath( const char *path, /* IN */ - int pathlen, /* IN */ - int flags, /* IN */ + size_t pathlen, /* IN */ + int flags, /* IN */ rtems_filesystem_location_info_t *pathloc /* IN/OUT */ ) { - return nfs_do_evalpath(path, pathlen, (void*)flags, pathloc, 0 /*not forMake*/); + union nfs_evalpath_arg args; + args.i = flags; + return nfs_do_evalpath(path, pathlen, &args, pathloc, 0 /*not forMake*/); } |