change log for rtems (2010-05-27)
rtems-vc at rtems.org
rtems-vc at rtems.org
Thu May 27 15:11:39 UTC 2010
*ralf*:
2010-05-27 Ralf Corsépius <ralf.corsepius at rtems.org>
* libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg.
M 1.2318 cpukit/ChangeLog
M 1.19 cpukit/libfs/src/nfsclient/src/nfs.c
diff -u rtems/cpukit/ChangeLog:1.2317 rtems/cpukit/ChangeLog:1.2318
--- rtems/cpukit/ChangeLog:1.2317 Thu May 27 07:39:33 2010
+++ rtems/cpukit/ChangeLog Thu May 27 09:20:09 2010
@@ -1,5 +1,9 @@
2010-05-27 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * libfs/src/nfsclient/src/nfs.c: Introduce union nfs_evalpath_arg.
+
+2010-05-27 Ralf Corsépius <ralf.corsepius at 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 -u rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.18 rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.19
--- rtems/cpukit/libfs/src/nfsclient/src/nfs.c:1.18 Thu May 27 04:42:14 2010
+++ rtems/cpukit/libfs/src/nfsclient/src/nfs.c Thu May 27 09:20:10 2010
@@ -1353,10 +1353,15 @@
*
*/
+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 @@
#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 @@
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*/);
}
--
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/20100527/05c2ee94/attachment.html>
More information about the vc
mailing list