Deleted Added
full compact
nfs_common.h (84079) nfs_common.h (88091)
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * @(#)nfsm_subs.h 8.2 (Berkeley) 3/30/95
1/*
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * @(#)nfsm_subs.h 8.2 (Berkeley) 3/30/95
37 * $FreeBSD: head/sys/nfs/nfs_common.h 84079 2001-09-28 04:37:08Z peter $
37 * $FreeBSD: head/sys/nfs/nfs_common.h 88091 2001-12-18 01:22:09Z iedowse $
38 */
39
40
41#ifndef _NFS_NFS_COMMON_H_
42#define _NFS_NFS_COMMON_H_
43
44extern enum vtype nv3tov_type[];
45extern nfstype nfsv3_type[];

--- 15 unchanged lines hidden (view full) ---

61
62#define nfsm_build(c, s) \
63 (c)nfsm_build_xx((s), &mb, &bpos)
64
65/* ****************************** */
66/* Interpretation phase macros */
67
68void *nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos);
38 */
39
40
41#ifndef _NFS_NFS_COMMON_H_
42#define _NFS_NFS_COMMON_H_
43
44extern enum vtype nv3tov_type[];
45extern nfstype nfsv3_type[];

--- 15 unchanged lines hidden (view full) ---

61
62#define nfsm_build(c, s) \
63 (c)nfsm_build_xx((s), &mb, &bpos)
64
65/* ****************************** */
66/* Interpretation phase macros */
67
68void *nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos);
69int nfsm_strsiz_xx(int *s, int m, u_int32_t **tl, struct mbuf **md,
70 caddr_t *dpos);
71int nfsm_adv_xx(int s, u_int32_t **tl, struct mbuf **md, caddr_t *dpos);
69int nfsm_strsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
70int nfsm_adv_xx(int s, struct mbuf **md, caddr_t *dpos);
72
73/* Error check helpers */
74#define nfsm_dcheck(t1, mrep) \
75do { \
76 if (t1 != 0) { \
77 error = t1; \
78 m_freem((mrep)); \
79 (mrep) = NULL; \

--- 17 unchanged lines hidden (view full) ---

97 ret = nfsm_dissect_xx((s), &md, &dpos); \
98 nfsm_dcheckp(ret, mrep); \
99 (c)ret; \
100})
101
102#define nfsm_strsiz(s,m) \
103do { \
104 int t1; \
71
72/* Error check helpers */
73#define nfsm_dcheck(t1, mrep) \
74do { \
75 if (t1 != 0) { \
76 error = t1; \
77 m_freem((mrep)); \
78 (mrep) = NULL; \

--- 17 unchanged lines hidden (view full) ---

96 ret = nfsm_dissect_xx((s), &md, &dpos); \
97 nfsm_dcheckp(ret, mrep); \
98 (c)ret; \
99})
100
101#define nfsm_strsiz(s,m) \
102do { \
103 int t1; \
105 t1 = nfsm_strsiz_xx(&(s), (m), &tl, &md, &dpos); \
104 t1 = nfsm_strsiz_xx(&(s), (m), &md, &dpos); \
106 nfsm_dcheck(t1, mrep); \
107} while(0)
108
109#define nfsm_mtouio(p,s) \
110do {\
111 int32_t t1 = 0; \
112 if ((s) > 0) \
113 t1 = nfsm_mbuftouio(&md, (p), (s), &dpos); \
114 nfsm_dcheck(t1, mrep); \
115} while (0)
116
117#define nfsm_rndup(a) (((a)+3)&(~0x3))
118
119#define nfsm_adv(s) \
120do { \
121 int t1; \
105 nfsm_dcheck(t1, mrep); \
106} while(0)
107
108#define nfsm_mtouio(p,s) \
109do {\
110 int32_t t1 = 0; \
111 if ((s) > 0) \
112 t1 = nfsm_mbuftouio(&md, (p), (s), &dpos); \
113 nfsm_dcheck(t1, mrep); \
114} while (0)
115
116#define nfsm_rndup(a) (((a)+3)&(~0x3))
117
118#define nfsm_adv(s) \
119do { \
120 int t1; \
122 t1 = nfsm_adv_xx((s), &tl, &md, &dpos); \
121 t1 = nfsm_adv_xx((s), &md, &dpos); \
123 nfsm_dcheck(t1, mrep); \
124} while (0)
125
126#endif
122 nfsm_dcheck(t1, mrep); \
123} while (0)
124
125#endif