diff options
| -rw-r--r-- | sys/kern/uipc_socket2.c | 11 | ||||
| -rw-r--r-- | sys/sys/socketvar.h | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 4f669b00488..c8982875fd3 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.18 2001/06/22 14:14:10 deraadt Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.19 2001/07/05 08:10:30 art Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -149,16 +149,13 @@ soisdisconnected(so) * then we allocate a new structure, properly linked into the * data structure of the original socket, and return this. * Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED. - * - * Currently, sonewconn() is defined as sonewconn1() in socketvar.h - * to catch calls that are missing the (new) second parameter. */ struct socket * -sonewconn1(head, connstatus) - register struct socket *head; +sonewconn(head, connstatus) + struct socket *head; int connstatus; { - register struct socket *so; + struct socket *so; int soqueue = connstatus ? 1 : 0; if (head->so_qlen + head->so_q0len > head->so_qlimit * 3) diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 0948db2dada..90653ae0969 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: socketvar.h,v 1.22 2001/06/22 14:11:00 deraadt Exp $ */ +/* $OpenBSD: socketvar.h,v 1.23 2001/07/05 08:10:31 art Exp $ */ /* $NetBSD: socketvar.h,v 1.18 1996/02/09 18:25:38 christos Exp $ */ /*- @@ -202,9 +202,7 @@ struct socket { #ifdef _KERNEL u_long sb_max; -/* to catch callers missing new second argument to sonewconn: */ -#define sonewconn(head, connstatus) sonewconn1((head), (connstatus)) -struct socket *sonewconn1 __P((struct socket *head, int connstatus)); +struct socket *sonewconn __P((struct socket *head, int connstatus)); /* strings for sleep message: */ extern char netio[], netcon[], netcls[]; @@ -268,8 +266,7 @@ void soisconnecting __P((struct socket *so)); void soisdisconnected __P((struct socket *so)); void soisdisconnecting __P((struct socket *so)); int solisten __P((struct socket *so, int backlog)); -struct socket * - sonewconn1 __P((struct socket *head, int connstatus)); +struct socket *sonewconn __P((struct socket *head, int connstatus)); void soqinsque __P((struct socket *head, struct socket *so, int q)); int soqremque __P((struct socket *so, int q)); int soreceive __P((struct socket *so, struct mbuf **paddr, struct uio *uio, |