diff options
Diffstat (limited to 'sys/compat/svr4/svr4_stream.c')
| -rw-r--r-- | sys/compat/svr4/svr4_stream.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index f052f7fbc6f..fcd4a109afe 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -1,4 +1,5 @@ -/* $NetBSD: svr4_stream.c,v 1.9 1995/10/07 06:27:52 mycroft Exp $ */ +/* $OpenBSD: svr4_stream.c,v 1.2 1996/02/26 23:32:03 niklas Exp $ */ +/* $NetBSD: svr4_stream.c,v 1.11 1996/02/10 00:48:12 christos Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -339,7 +340,7 @@ svr4_showioc(str, ioc) int error; int i; - printf("%s cmd = %d, timeout = %d, len = %d, buf = %x { ", + printf("%s cmd = %d, timeout = %d, len = %d, buf = %p { ", str, ioc->cmd, ioc->timeout, ioc->len, ioc->buf); if ((error = copyin(ioc->buf, ptr, ioc->len)) != 0) { @@ -584,7 +585,7 @@ svr4_getstrbuf(str) } } - printf(", { %d, %d, %x=[ ", str->maxlen, str->len, str->buf); + printf(", { %d, %d, %p=[ ", str->maxlen, str->len, str->buf); for (i = 0; i < len; i++) { printf("%x ", (unsigned char) ptr[i]); if (i > 20) { @@ -688,7 +689,7 @@ svr4_sys_putmsg(p, v, retval) } so = (struct socket *) fp->f_data; - st = (struct svr4_strm *) so->so_tpcb; + st = (struct svr4_strm *) so->so_internal; if (ctl.len > sizeof(sc)) { @@ -821,7 +822,7 @@ svr4_sys_getmsg(p, v, retval) } so = (struct socket *) fp->f_data; - st = (struct svr4_strm *) so->so_tpcb; + st = (struct svr4_strm *) so->so_internal; if (ctl.maxlen == -1 || dat.maxlen == -1) { DPRINTF(("getmsg: Cannot handle -1 maxlen (yet)\n")); @@ -913,7 +914,7 @@ svr4_sys_getmsg(p, v, retval) aiov.iov_len = dat.maxlen; msg.msg_flags = 0; - error = recvit(p, SCARG(uap, fd), &msg, flen, retval); + error = recvit(p, SCARG(uap, fd), &msg, (caddr_t) flen, retval); if (error) { DPRINTF(("getmsg: recvit failed %d\n", error)) |