diff options
author | fenner <fenner@FreeBSD.org> | 1997-07-19 20:15:43 +0000 |
---|---|---|
committer | fenner <fenner@FreeBSD.org> | 1997-07-19 20:15:43 +0000 |
commit | 38192cf9a58e44202d926c75756a54dfbf5f295a (patch) | |
tree | 6c7617b8ce09ddc2696a9882def0032e95991f29 /sys | |
parent | a47a697ebe124771d7d54de0afd01ae48359fb6a (diff) | |
download | FreeBSD-src-38192cf9a58e44202d926c75756a54dfbf5f295a.zip FreeBSD-src-38192cf9a58e44202d926c75756a54dfbf5f295a.tar.gz |
Remove sonewconn() macro kludge, introduced in 4.3-Reno to catch argument
mismatches. Prototypes do a much better job these days.
Noticed by: bde
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/uipc_sockbuf.c | 7 | ||||
-rw-r--r-- | sys/kern/uipc_socket2.c | 7 | ||||
-rw-r--r-- | sys/sys/socketvar.h | 7 |
3 files changed, 6 insertions, 15 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 4814a66..978b46a 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.24 1997/04/27 20:00:44 wollman Exp $ + * $Id: uipc_socket2.c,v 1.25 1997/05/24 17:23:10 peter Exp $ */ #include <sys/param.h> @@ -193,12 +193,9 @@ sodropablereq(head) * then we allocate a new structure, propoerly linked into the * data structure of the original socket, and return this. * Connstatus may be 0, or SO_ISCONFIRMING, or SO_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) +sonewconn(head, connstatus) register struct socket *head; int connstatus; { diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 4814a66..978b46a 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.24 1997/04/27 20:00:44 wollman Exp $ + * $Id: uipc_socket2.c,v 1.25 1997/05/24 17:23:10 peter Exp $ */ #include <sys/param.h> @@ -193,12 +193,9 @@ sodropablereq(head) * then we allocate a new structure, propoerly linked into the * data structure of the original socket, and return this. * Connstatus may be 0, or SO_ISCONFIRMING, or SO_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) +sonewconn(head, connstatus) register struct socket *head; int connstatus; { diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 39aab67..2a4ddae 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $Id: socketvar.h,v 1.18 1997/02/22 09:45:56 peter Exp $ + * $Id: socketvar.h,v 1.19 1997/04/27 20:01:28 wollman Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -200,9 +200,6 @@ struct socket { #ifdef KERNEL extern u_long sb_max; -/* to catch callers missing new second argument to sonewconn: */ -#define sonewconn(head, connstatus) sonewconn1((head), (connstatus)) - struct filedesc; struct mbuf; struct sockaddr; @@ -262,7 +259,7 @@ int solisten __P((struct socket *so, int backlog, struct proc *p)); struct socket * sodropablereq __P((struct socket *head)); struct socket * - sonewconn1 __P((struct socket *head, int connstatus)); + sonewconn __P((struct socket *head, int connstatus)); int soreceive __P((struct socket *so, struct mbuf **paddr, struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, int *flagsp)); int soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc)); |