xnu-344.tar.gz

[apple/xnu.git] / bsd / kern / uipc_usrreq.c

diff --git a/bsd/kern/uipc_usrreq.c b/bsd/kern/uipc_usrreq.c
index 459a67a057ca89ef8c31e564aae71e5ec8420e8a..905652beeb9f7f9373eb03008eea25d9c6767ed5 100644 (file)
--- a/bsd/kern/uipc_usrreq.c
+++ b/bsd/kern/uipc_usrreq.c
@@ -502,7 +502,7 @@ unp_attach(so)
                if (error)
                        return (error);
        }
-       unp = zalloc(unp_zone);
+       unp = (struct unpcb*)zalloc(unp_zone);
        if (unp == NULL)
                return (ENOBUFS);
        bzero(unp, sizeof *unp);
@@ -550,7 +550,7 @@ unp_detach(unp)
        }
        if (unp->unp_addr)
                FREE(unp->unp_addr, M_SONAME);
-       zfree(unp_zone, unp);
+       zfree(unp_zone, (vm_offset_t)unp);
 }
 
 static int
@@ -568,7 +568,6 @@ unp_bind(unp, nam, p)
 
        if (unp->unp_vnode != NULL)
                return (EINVAL);
-#define offsetof(s, e) ((char *)&((s *)0)->e - (char *)((s *)0))
        namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
        if (namelen <= 0)
                return EINVAL;
@@ -884,7 +883,7 @@ unp_drop(unp, errno)
                so->so_pcb = (caddr_t) 0;
                if (unp->unp_addr)
                        FREE(unp->unp_addr, M_SONAME);
-               zfree(unp_zone, unp);
+               zfree(unp_zone, (vm_offset_t)unp);
                sofree(so);
        }
 }