RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg.
This commit is contained in:
Ralf Corsepius
2010-05-27 14:20:10 +00:00
parent d422a4d85a
commit bf0b23a48e
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/ChangeLog
View File

@@ -1,3 +1,7 @@
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> 2010-05-27 Ralf Corsépius <ralf.corsepius@rtems.org>
* librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c: * librpc/src/rpc/clnt_tcp.c, librpc/src/rpc/clnt_udp.c:

24
cpukit/libfs/src/nfsclient/src/nfs.c
View File

@@ -1353,10 +1353,15 @@ struct rtems_filesystem_location_info_tt
* *
*/ */
union nfs_evalpath_arg {
int i;
const char **c;
};
STATIC int nfs_do_evalpath( STATIC int nfs_do_evalpath(
const char *pathname, /* IN */ const char *pathname, /* IN */
int pathnamelen, /* IN */ int pathnamelen, /* IN */
void *arg, union nfs_evalpath_arg *arg,
rtems_filesystem_location_info_t *pathloc, /* IN/OUT */ rtems_filesystem_location_info_t *pathloc, /* IN/OUT */
int forMake int forMake
) )
@@ -1510,9 +1515,9 @@ unsigned long niu,siu;
#endif #endif
if (forMake) if (forMake)
rval = pathloc->ops->evalformake_h(part, pathloc, (const char**)arg); rval = pathloc->ops->evalformake_h(part, pathloc, arg->c);
else 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); free(p);
return rval; return rval;
@@ -1669,17 +1674,22 @@ static int nfs_evalformake(
const char **pname /* OUT */ 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( static int nfs_evalpath(
const char *path, /* IN */ const char *path, /* IN */
int pathlen, /* IN */ size_t pathlen, /* IN */
int flags, /* IN */ int flags, /* IN */
rtems_filesystem_location_info_t *pathloc /* IN/OUT */ 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*/);
} }