Module Name: src
Committed By: riastradh
Date: Fri Dec 6 18:36:47 UTC 2024
Modified Files:
src/sys/kern: sys_socket.c uipc_accf.c uipc_socket.c uipc_socket2.c
uipc_usrreq.c
Log Message:
sys/kern/sys_socket.c, uipc_*.c: Nix trailing whitespace.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.14 -r1.15 src/sys/kern/uipc_accf.c
cvs rdiff -u -r1.311 -r1.312 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.144 -r1.145 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.204 -r1.205 src/sys/kern/uipc_usrreq.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/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.82 src/sys/kern/sys_socket.c:1.83
--- src/sys/kern/sys_socket.c:1.82 Fri Dec 6 18:36:31 2024
+++ src/sys/kern/sys_socket.c Fri Dec 6 18:36:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.82 2024/12/06 18:36:31 riastradh Exp $ */
+/* $NetBSD: sys_socket.c,v 1.83 2024/12/06 18:36:47 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.82 2024/12/06 18:36:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.83 2024/12/06 18:36:47 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -139,7 +139,7 @@ soo_ioctl(file_t *fp, u_long cmd, void *
solock(so);
if (*(int *)data)
so->so_state |= SS_NBIO;
- else
+ else
so->so_state &= ~SS_NBIO;
sounlock(so);
break;
Index: src/sys/kern/uipc_accf.c
diff -u src/sys/kern/uipc_accf.c:1.14 src/sys/kern/uipc_accf.c:1.15
--- src/sys/kern/uipc_accf.c:1.14 Fri Dec 6 18:36:31 2024
+++ src/sys/kern/uipc_accf.c Fri Dec 6 18:36:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_accf.c,v 1.14 2024/12/06 18:36:31 riastradh Exp $ */
+/* $NetBSD: uipc_accf.c,v 1.15 2024/12/06 18:36:47 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_accf.c,v 1.14 2024/12/06 18:36:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_accf.c,v 1.15 2024/12/06 18:36:47 riastradh Exp $");
#define ACCEPT_FILTER_MOD
@@ -120,7 +120,7 @@ accept_filt_add(struct accept_filter *fi
rw_exit(&accept_filter_lock);
return EEXIST;
}
- }
+ }
LIST_INSERT_HEAD(&accept_filtlsthd, filt, accf_next);
rw_exit(&accept_filter_lock);
@@ -187,7 +187,7 @@ accept_filter_init0(void)
}
/*
- * Initialization routine: This can also be replaced with
+ * Initialization routine: This can also be replaced with
* accept_filt_generic_mod_event for attaching new accept filter.
*/
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.311 src/sys/kern/uipc_socket.c:1.312
--- src/sys/kern/uipc_socket.c:1.311 Fri Dec 6 18:36:31 2024
+++ src/sys/kern/uipc_socket.c Fri Dec 6 18:36:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.311 2024/12/06 18:36:31 riastradh Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.312 2024/12/06 18:36:47 riastradh Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009, 2023 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.311 2024/12/06 18:36:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.312 2024/12/06 18:36:47 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -455,7 +455,7 @@ soinit(void)
/* Update the SCTP function hooks if necessary*/
vec_sctp_add_ip_address = sctp_add_ip_address;
- vec_sctp_delete_ip_address = sctp_delete_ip_address;
+ vec_sctp_delete_ip_address = sctp_delete_ip_address;
#endif
mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM);
@@ -576,7 +576,7 @@ socreate(int dom, struct socket **aso, i
* Caller is responsible for calling fd_affix() for the returned *fpp once
* it's socket initialization is finished successfully, or fd_abort() if it's
* initialization fails.
- *
+ *
*
* => On success, write file descriptor to *fdout and *fpp and return zero.
* => On failure, return non-zero; *fdout and *fpp will be undefined.
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.144 src/sys/kern/uipc_socket2.c:1.145
--- src/sys/kern/uipc_socket2.c:1.144 Fri Dec 6 18:36:31 2024
+++ src/sys/kern/uipc_socket2.c Fri Dec 6 18:36:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.144 2024/12/06 18:36:31 riastradh Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.145 2024/12/06 18:36:47 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.144 2024/12/06 18:36:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.145 2024/12/06 18:36:47 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -578,7 +578,7 @@ sowakeup(struct socket *so, struct sockb
band = 0;
#ifdef DIAGNOSTIC
printf("bad siginfo code %d in socket notification.\n", code);
-#endif
+#endif
break;
}
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.204 src/sys/kern/uipc_usrreq.c:1.205
--- src/sys/kern/uipc_usrreq.c:1.204 Fri Dec 6 18:36:31 2024
+++ src/sys/kern/uipc_usrreq.c Fri Dec 6 18:36:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.204 2024/12/06 18:36:31 riastradh Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.205 2024/12/06 18:36:47 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.204 2024/12/06 18:36:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.205 2024/12/06 18:36:47 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -152,7 +152,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.
*
* o Stream sockets created via socket() start life with their own
* independent lock.
- *
+ *
* o Stream connections to a named endpoint are slightly more complicated.
* Sockets that have called listen() have their lock pointer mutated to
* the global uipc_lock. When establishing a connection, the connecting
@@ -894,7 +894,7 @@ unp_stat(struct socket *so, struct stat
switch (so->so_type) {
case SOCK_SEQPACKET: /* FALLTHROUGH */
case SOCK_STREAM:
- if (unp->unp_conn == 0)
+ if (unp->unp_conn == 0)
break;
so2 = unp->unp_conn->unp_socket;
@@ -1812,7 +1812,7 @@ unp_gc(file_t *dp)
/*
* Ignore non-sockets.
* Ignore dead sockets, or sockets with pending close.
- * Ignore sockets obviously referenced elsewhere.
+ * Ignore sockets obviously referenced elsewhere.
* Ignore sockets marked as referenced by our scan.
* Ignore new sockets that did not exist during the scan.
*/
