summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-01-23 04:11:46 +0000
committertedu <tedu@openbsd.org>2014-01-23 04:11:46 +0000
commit07b441114210d1b0e09c4b4a056be66c4b4f1ba2 (patch)
tree5bcd81cbc63cda13ab1d264eb9d891bf03a94e1d
parentSwitch to task queues, except for one little corner case that I need to think (diff)
downloadwireguard-openbsd-07b441114210d1b0e09c4b4a056be66c4b4f1ba2.tar.xz
wireguard-openbsd-07b441114210d1b0e09c4b4a056be66c4b4f1ba2.zip
adjust a comment or two
-rw-r--r--sys/compat/linux/linux_misc.c7
-rw-r--r--sys/compat/linux/linux_socket.c16
2 files changed, 12 insertions, 11 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index c087a93b131..eda30fe40ff 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_misc.c,v 1.84 2013/12/08 03:30:01 brad Exp $ */
+/* $OpenBSD: linux_misc.c,v 1.85 2014/01/23 04:11:46 tedu Exp $ */
/* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */
/*-
@@ -1223,7 +1223,7 @@ getdents_common(p, v, retval, is64bit)
/*
* Not sure why the arguments to this older version of select() were put
- * into a structure, because there are 5, and that can all be handled
+ * into a structure, because there are 5, and that can be handled all
* in registers on the i386 like Linux wants to.
*/
int
@@ -1676,7 +1676,8 @@ linux_sys_prctl(struct proc *p, void *v, register_t *retval)
*retval = 0;
break;
case LINUX_PR_SET_KEEPCAPS:
- /* Ignore requests to keep the effective and permitted
+ /*
+ * Ignore requests to keep the effective and permitted
* capability sets when the user id becomes non-zero.
*/
break;
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 297125da01e..397325d9599 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_socket.c,v 1.46 2012/06/26 10:18:08 pirofti Exp $ */
+/* $OpenBSD: linux_socket.c,v 1.47 2014/01/23 04:11:46 tedu Exp $ */
/* $NetBSD: linux_socket.c,v 1.14 1996/04/05 00:01:50 christos Exp $ */
/*
@@ -73,7 +73,7 @@
/*
* All the calls in this file are entered via one common system
- * call in Linux, represented here by linux_socketcall()
+ * call in Linux, represented here by linux_socketcall().
* Arguments for the various calls are on the user stack. A pointer
* to them is the only thing that is passed. It is up to the various
* calls to copy them in themselves. To make it look better, they
@@ -178,7 +178,7 @@ static const int bsd_to_linux_domain_[AF_MAX] = {
};
/*
- * Convert between Linux and BSD socket domain values
+ * Convert from Linux to BSD socket domain values
*/
static int
linux_to_bsd_domain(ldom)
@@ -191,7 +191,7 @@ linux_to_bsd_domain(ldom)
}
/*
- * Convert between BSD and Linux socket domain values
+ * Convert from BSD to Linux socket domain values
*/
static int
bsd_to_linux_domain(bdom)
@@ -204,7 +204,7 @@ bsd_to_linux_domain(bdom)
}
/*
- * Convert between Linux and BSD MSG_XXX flags
+ * Convert from Linux to BSD MSG_XXX flags
*/
static int
linux_to_bsd_msg_flags(int lflags)
@@ -941,7 +941,7 @@ linux_to_bsd_so_sockopt(lopt)
* of a host:port pair through SO_REUSEADDR even if the
* address is not a multicast-address. Effectively, this
* means that we should use SO_REUSEPORT to allow Linux
- * applications to not exit with EADDRINUSE.
+ * applications to not receive EADDRINUSE.
*/
return SO_REUSEPORT;
case LINUX_SO_TYPE:
@@ -1286,7 +1286,7 @@ done:
/*
* Copy the osockaddr structure pointed to by osa to kernel, adjust
* family and convert to sockaddr, allocate stackgap and put the
- * the converted structure there, address on stackgap returned in sap.
+ * the converted structure there. Address on stackgap returned in sap.
*/
int
linux_sa_get(p, sgp, sap, osa, osalen)
@@ -1506,7 +1506,7 @@ linux_ioctl_socket(p, v, retval)
/*
* Don't try to interpret socket ioctl calls that are done
- * on a device filedescriptor, just pass them through, to
+ * on a device file descriptor, just pass them through, to
* emulate Linux behaviour. Use PTIOCLINUX so that the
* device will only handle these if it's prepared to do
* so, to avoid unexpected things from happening.