diff options
author | iedowse <iedowse@FreeBSD.org> | 2001-12-18 01:22:09 +0000 |
---|---|---|
committer | iedowse <iedowse@FreeBSD.org> | 2001-12-18 01:22:09 +0000 |
commit | 6e9f1df98f816467a63dc5b41cea58f28843e390 (patch) | |
tree | 9270c37106f68890c1fcce6d366590e69faa1848 /sys/nfs/nfs_common.c | |
parent | bba76f2085975aeba776356b2556c99b8c882bd5 (diff) | |
download | FreeBSD-src-6e9f1df98f816467a63dc5b41cea58f28843e390.zip FreeBSD-src-6e9f1df98f816467a63dc5b41cea58f28843e390.tar.gz |
Avoid passing the variable `tl' to functions that just use it for
temporary storage. In the old NFS code it wasn't at all clear if
the value of `tl' was used across or after macro calls, but I'm
fairly confident that the convention was to keep its use local.
Each ex-macro function now uses a local version of this variable,
so all of the double-indirection goes away.
The only exception to the `local use' rule for `tl' is nfsm_clget(),
which is left unchanged by this commit.
Reviewed by: peter
Diffstat (limited to 'sys/nfs/nfs_common.c')
-rw-r--r-- | sys/nfs/nfs_common.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 029096a..d4a957e 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -286,20 +286,21 @@ nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos) } int -nfsm_strsiz_xx(int *s, int m, u_int32_t **tl, struct mbuf **mb, caddr_t *bpos) +nfsm_strsiz_xx(int *s, int m, struct mbuf **mb, caddr_t *bpos) { + u_int32_t *tl; - *tl = nfsm_dissect_xx(NFSX_UNSIGNED, mb, bpos); - if (*tl == NULL) + tl = nfsm_dissect_xx(NFSX_UNSIGNED, mb, bpos); + if (tl == NULL) return EBADRPC; - *s = fxdr_unsigned(int32_t, **tl); + *s = fxdr_unsigned(int32_t, *tl); if (*s > m) return EBADRPC; return 0; } int -nfsm_adv_xx(int s, u_int32_t **tl, struct mbuf **md, caddr_t *dpos) +nfsm_adv_xx(int s, struct mbuf **md, caddr_t *dpos) { int t1; |