Module Name: src
Committed By: matt
Date: Fri Sep 5 05:37:37 UTC 2014
Modified Files:
src/sys/sys: socketvar.h
Log Message:
Don't nest structure definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/sys/socketvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/socketvar.h
diff -u src/sys/sys/socketvar.h:1.134 src/sys/sys/socketvar.h:1.135
--- src/sys/sys/socketvar.h:1.134 Wed Jul 9 04:54:04 2014
+++ src/sys/sys/socketvar.h Fri Sep 5 05:37:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: socketvar.h,v 1.134 2014/07/09 04:54:04 rtr Exp $ */
+/* $NetBSD: socketvar.h,v 1.135 2014/09/05 05:37:37 matt Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -121,6 +121,12 @@ struct sockbuf {
* handle on protocol and pointer to protocol
* private data and error information.
*/
+struct so_accf {
+ struct accept_filter *so_accept_filter;
+ void *so_accept_filter_arg; /* saved filter args */
+ char *so_accept_filter_str; /* saved user args */
+};
+
struct socket {
kmutex_t * volatile so_lock; /* pointer to lock on structure */
kcondvar_t so_cv; /* notifier */
@@ -172,11 +178,7 @@ struct socket {
struct uidinfo *so_uidinfo; /* who opened the socket */
gid_t so_egid; /* creator effective gid */
pid_t so_cpid; /* creator pid */
- struct so_accf {
- struct accept_filter *so_accept_filter;
- void *so_accept_filter_arg; /* saved filter args */
- char *so_accept_filter_str; /* saved user args */
- } *so_accf;
+ struct so_accf *so_accf;
kauth_cred_t so_cred; /* socket credentials */
};
