Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys/compat/common Merge rev 1.49 from HEAD
details: https://anonhg.NetBSD.org/src/rev/388a4d229d58
branches: pgoyette-compat
changeset: 321171:388a4d229d58
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Fri May 04 02:38:46 2018 +0000
description:
Merge rev 1.49 from HEAD
diffstat:
sys/compat/common/uipc_syscalls_43.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (36 lines):
diff -r 51a673a175d6 -r 388a4d229d58 sys/compat/common/uipc_syscalls_43.c
--- a/sys/compat/common/uipc_syscalls_43.c Wed May 02 07:19:58 2018 +0000
+++ b/sys/compat/common/uipc_syscalls_43.c Fri May 04 02:38:46 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_43.c,v 1.47.14.2 2018/04/17 00:02:58 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_43.c,v 1.47.14.3 2018/05/04 02:38:46 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47.14.2 2018/04/17 00:02:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.47.14.3 2018/05/04 02:38:46 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -233,7 +233,7 @@
msg.msg_iov = omsg.msg_iov;
msg.msg_flags = (SCARG(uap, flags) & MSG_USERFLAGS) | MSG_IOVUSRSPACE;
- error = do_sys_recvmsg(l, SCARG(uap, s), &msg, NULL, 0, &from,
+ error = do_sys_recvmsg(l, SCARG(uap, s), &msg, NULL, &from,
omsg.msg_accrights != NULL ? &control : NULL, retval);
if (error != 0)
return error;
@@ -380,7 +380,7 @@
goto bad;
return do_sys_sendmsg(l, SCARG(uap, s), &msg, SCARG(uap, flags),
- NULL, 0, retval);
+ retval);
bad:
if (nam != NULL)
Home |
Main Index |
Thread Index |
Old Index