BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / nfs / nfsm_subs.h

diff --git a/usr/src/sys/nfs/nfsm_subs.h b/usr/src/sys/nfs/nfsm_subs.h
index d0edf1c..7bbf77c 100644 (file)
--- a/usr/src/sys/nfs/nfsm_subs.h
+++ b/usr/src/sys/nfs/nfsm_subs.h
@@ -5,22 +5,35 @@
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University nor the names of
- * its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)nfsm_subs.h 7.10 (Berkeley) 6/28/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)nfsm_subs.h 7.11 (Berkeley) 4/16/91

  */
 
 /*
  */
 
 /*


@@ -143,16 +156,16 @@ extern struct mbuf *nfsm_reqh();
                (v) = tvp; }
 
 #define        nfsm_strsiz(s,m) \
                (v) = tvp; }
 
 #define        nfsm_strsiz(s,m) \

-               nfsm_disect(p,u_long *,NFSX_UNSIGNED); \
-               if (((s) = fxdr_unsigned(long,*p)) > (m)) { \
+               nfsm_disect(tl,u_long *,NFSX_UNSIGNED); \
+               if (((s) = fxdr_unsigned(long,*tl)) > (m)) { \

                        m_freem(mrep); \
                        error = EBADRPC; \
                        goto nfsmout; \
                }
 
 #define        nfsm_srvstrsiz(s,m) \
                        m_freem(mrep); \
                        error = EBADRPC; \
                        goto nfsmout; \
                }
 
 #define        nfsm_srvstrsiz(s,m) \

-               nfsm_disect(p,u_long *,NFSX_UNSIGNED); \
-               if (((s) = fxdr_unsigned(long,*p)) > (m) || (s) <= 0) { \
+               nfsm_disect(tl,u_long *,NFSX_UNSIGNED); \
+               if (((s) = fxdr_unsigned(long,*tl)) > (m) || (s) <= 0) { \

                        error = EBADRPC; \
                        nfsm_reply(0); \
                }
                        error = EBADRPC; \
                        nfsm_reply(0); \
                }


@@ -194,10 +207,10 @@ extern struct mbuf *nfsm_reqh();
                } \
                t2 = nfsm_rndup(s)+NFSX_UNSIGNED; \
                if(t2<=(NFSMSIZ(mb)-mb->m_len)){ \
                } \
                t2 = nfsm_rndup(s)+NFSX_UNSIGNED; \
                if(t2<=(NFSMSIZ(mb)-mb->m_len)){ \

-                       nfsm_build(p,u_long *,t2); \
-                       *p++ = txdr_unsigned(s); \
-                       *(p+((t2>>2)-2)) = 0; \
-                       bcopy((caddr_t)(a), (caddr_t)p, (s)); \
+                       nfsm_build(tl,u_long *,t2); \
+                       *tl++ = txdr_unsigned(s); \
+                       *(tl+((t2>>2)-2)) = 0; \
+                       bcopy((caddr_t)(a), (caddr_t)tl, (s)); \

                } else if (error = nfsm_strtmbuf(&mb, &bpos, (a), (s))) { \
                        m_freem(mreq); \
                        goto nfsmout; \
                } else if (error = nfsm_strtmbuf(&mb, &bpos, (a), (s))) { \
                        m_freem(mreq); \
                        goto nfsmout; \


@@ -246,8 +259,8 @@ extern struct mbuf *nfsm_reqh();
                }
 
 #define nfsm_srvmtofh(f) \
                }
 
 #define nfsm_srvmtofh(f) \

-               nfsm_disecton(p, u_long *, NFSX_FH); \
-               bcopy((caddr_t)p, (caddr_t)f, NFSX_FH)
+               nfsm_disecton(tl, u_long *, NFSX_FH); \
+               bcopy((caddr_t)tl, (caddr_t)f, NFSX_FH)

 
 #define        nfsm_clget \
                if (bp >= be) { \
 
 #define        nfsm_clget \
                if (bp >= be) { \


@@ -263,7 +276,7 @@ extern struct mbuf *nfsm_reqh();
                        bp = mtod(mp, caddr_t); \
                        be = bp+mp->m_len; \
                } \
                        bp = mtod(mp, caddr_t); \
                        be = bp+mp->m_len; \
                } \

-               p = (u_long *)bp
+               tl = (u_long *)bp

 
 #define        nfsm_srvfillattr \
        fp->fa_type = vtonfs_type(vap->va_type); \
 
 #define        nfsm_srvfillattr \
        fp->fa_type = vtonfs_type(vap->va_type); \