aboutsummaryrefslogtreecommitdiff
path: root/sys/nfs
diff options
context:
space:
mode:
authorIan Dowse <iedowse@FreeBSD.org>2001-12-18 01:22:09 +0000
committerIan Dowse <iedowse@FreeBSD.org>2001-12-18 01:22:09 +0000
commit9669bb479ad8d5934ce8cda9284b5a4d2f12d74d (patch)
tree9270c37106f68890c1fcce6d366590e69faa1848 /sys/nfs
parentcb28eb78cba4ab974c6bdd797b828009d5cdb923 (diff)
Notes
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs_common.c11
-rw-r--r--sys/nfs/nfs_common.h9
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 029096ab8d737..d4a957e9e5f9d 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;
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 889054d05aed4..3b3ab85ad0d97 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -66,9 +66,8 @@ void *nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos);
/* Interpretation phase macros */
void *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 **md,
- caddr_t *dpos);
-int nfsm_adv_xx(int s, u_int32_t **tl, struct mbuf **md, caddr_t *dpos);
+int nfsm_strsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
+int nfsm_adv_xx(int s, struct mbuf **md, caddr_t *dpos);
/* Error check helpers */
#define nfsm_dcheck(t1, mrep) \
@@ -102,7 +101,7 @@ do { \
#define nfsm_strsiz(s,m) \
do { \
int t1; \
- t1 = nfsm_strsiz_xx(&(s), (m), &tl, &md, &dpos); \
+ t1 = nfsm_strsiz_xx(&(s), (m), &md, &dpos); \
nfsm_dcheck(t1, mrep); \
} while(0)
@@ -119,7 +118,7 @@ do {\
#define nfsm_adv(s) \
do { \
int t1; \
- t1 = nfsm_adv_xx((s), &tl, &md, &dpos); \
+ t1 = nfsm_adv_xx((s), &md, &dpos); \
nfsm_dcheck(t1, mrep); \
} while (0)