BSD 4_4 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 3bddca8..879db36 100644 (file)
--- a/usr/src/sys/nfs/nfsm_subs.h
+++ b/usr/src/sys/nfs/nfsm_subs.h
@@ -1,13 +1,39 @@
 /*
 /*

- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * 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.
  *

- * %sccs.include.redist.c%
+ * 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.15 (Berkeley) %G%
+ * 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 8.1 (Berkeley) 6/16/93

  */
 
 /*
  */
 
 /*


@@ -65,19 +91,7 @@ extern struct mbuf *nfsm_reqh();
                if (t1 >= (s)) { \
                        (a) = (c)(dpos); \
                        dpos += (s); \
                if (t1 >= (s)) { \
                        (a) = (c)(dpos); \
                        dpos += (s); \

-               } else if (error = nfsm_disct(&md, &dpos, (s), t1, TRUE, &cp2)) { \
-                       m_freem(mrep); \
-                       goto nfsmout; \
-               } else { \
-                       (a) = (c)cp2; \
-               } }
-
-#define        nfsm_dissecton(a,c,s) \
-               { t1 = mtod(md, caddr_t)+md->m_len-dpos; \
-               if (t1 >= (s)) { \
-                       (a) = (c)(dpos); \
-                       dpos += (s); \
-               } else if (error = nfsm_disct(&md, &dpos, (s), t1, FALSE, &cp2)) { \
+               } else if (error = nfsm_disct(&md, &dpos, (s), t1, &cp2)) { \

                        m_freem(mrep); \
                        goto nfsmout; \
                } else { \
                        m_freem(mrep); \
                        goto nfsmout; \
                } else { \


@@ -198,7 +212,7 @@ extern struct mbuf *nfsm_reqh();
                }
 
 #define nfsm_srvmtofh(f) \
                }
 
 #define nfsm_srvmtofh(f) \

-               nfsm_dissecton(tl, u_long *, NFSX_FH); \
+               nfsm_dissect(tl, u_long *, NFSX_FH); \

                bcopy((caddr_t)tl, (caddr_t)f, NFSX_FH)
 
 #define        nfsm_clget \
                bcopy((caddr_t)tl, (caddr_t)f, NFSX_FH)
 
 #define        nfsm_clget \