Change to includes. no more ../h

[unix-history] / usr / src / sys / kern / uipc_mbuf.c

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 6bd164d..4d3b56b 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,16 +1,16 @@
-/*     uipc_mbuf.c     6.1     83/07/29        */
+/*     uipc_mbuf.c     6.3     84/08/29        */

 
 #include "../machine/pte.h"
 
 
 #include "../machine/pte.h"
 

-#include "../h/param.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/cmap.h"
-#include "../h/map.h"
-#include "../h/mbuf.h"
-#include "../h/vm.h"
-#include "../h/kernel.h"
+#include "param.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "cmap.h"
+#include "map.h"
+#include "mbuf.h"
+#include "vm.h"
+#include "kernel.h"

 
 mbinit()
 {
 
 mbinit()
 {


@@ -181,13 +181,11 @@ m_copy(m, off, len)
 {
        register struct mbuf *n, **np;
        struct mbuf *top, *p;
 {
        register struct mbuf *n, **np;
        struct mbuf *top, *p;

-       int type;

 
        if (len == 0)
                return (0);
        if (off < 0 || len < 0)
                panic("m_copy");
 
        if (len == 0)
                return (0);
        if (off < 0 || len < 0)
                panic("m_copy");

-       type = m->m_type;

        while (off > 0) {
                if (m == 0)
                        panic("m_copy");
        while (off > 0) {
                if (m == 0)
                        panic("m_copy");


@@ -204,7 +202,7 @@ m_copy(m, off, len)
                                panic("m_copy");
                        break;
                }
                                panic("m_copy");
                        break;
                }

-               MGET(n, M_WAIT, type);
+               MGET(n, M_WAIT, m->m_type);

                *np = n;
                if (n == 0)
                        goto nospace;
                *np = n;
                if (n == 0)
                        goto nospace;