Module Name: src
Committed By: christos
Date: Sat May 5 02:09:41 UTC 2018
Modified Files:
src/sys/compat/osf1: osf1_socket.c
src/sys/compat/svr4: svr4_stream.c
Log Message:
finish ktrace argument removal for do_sys_{send,recv}msg
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/osf1/osf1_socket.c
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/svr4/svr4_stream.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/osf1/osf1_socket.c
diff -u src/sys/compat/osf1/osf1_socket.c:1.22 src/sys/compat/osf1/osf1_socket.c:1.23
--- src/sys/compat/osf1/osf1_socket.c:1.22 Tue Sep 13 03:01:08 2016
+++ src/sys/compat/osf1/osf1_socket.c Fri May 4 22:09:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_socket.c,v 1.22 2016/09/13 07:01:08 martin Exp $ */
+/* $NetBSD: osf1_socket.c,v 1.23 2018/05/05 02:09:40 christos Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.22 2016/09/13 07:01:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.23 2018/05/05 02:09:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,8 +130,7 @@ osf1_sys_sendmsg_xopen(struct lwp *l, co
bsd_iovec[i].iov_len = osf_iovec.iov_len;
}
- error = do_sys_sendmsg(l, SCARG(uap, s), &bsd_msghdr, flags, NULL, 0,
- retval);
+ error = do_sys_sendmsg(l, SCARG(uap, s), &bsd_msghdr, flags, retval);
err:
kmem_free(bsd_iovec, iov_len * sizeof(struct iovec));
return error;
Index: src/sys/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.92 src/sys/compat/svr4/svr4_stream.c:1.93
--- src/sys/compat/svr4/svr4_stream.c:1.92 Sat Sep 16 05:05:29 2017
+++ src/sys/compat/svr4/svr4_stream.c Fri May 4 22:09:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $ */
+/* $NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1540,7 +1540,7 @@ svr4_sys_putmsg(struct lwp *l, const str
aiov.iov_base = NETBSD32PTR(dat.buf);
aiov.iov_len = dat.len;
error = do_sys_sendmsg(l, SCARG(uap, fd), &msg,
- SCARG(uap, flags), NULL, 0, retval);
+ SCARG(uap, flags), retval);
*retval = 0;
return error;
@@ -1781,7 +1781,7 @@ svr4_sys_getmsg(struct lwp *l, const str
aiov.iov_len = dat.maxlen;
msg.msg_flags = 0;
- error = do_sys_recvmsg(l, SCARG(uap, fd), &msg, NULL, 0,
+ error = do_sys_recvmsg(l, SCARG(uap, fd), &msg,
&name, NULL, retval);
if (error) {
