Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net Make raw_input non-variadic.



details:   https://anonhg.NetBSD.org/src/rev/013c3835ec5e
branches:  trunk
changeset: 433308:013c3835ec5e
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Sep 07 06:13:14 2018 +0000

description:
Make raw_input non-variadic.

diffstat:

 sys/net/raw_cb.h     |   5 +++--
 sys/net/raw_usrreq.c |  18 ++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diffs (62 lines):

diff -r 167da641b120 -r 013c3835ec5e sys/net/raw_cb.h
--- a/sys/net/raw_cb.h  Fri Sep 07 06:08:16 2018 +0000
+++ b/sys/net/raw_cb.h  Fri Sep 07 06:13:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_cb.h,v 1.29 2018/05/11 09:43:59 roy Exp $  */
+/*     $NetBSD: raw_cb.h,v 1.30 2018/09/07 06:13:14 maxv Exp $ */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -65,7 +65,8 @@
 void   *raw_ctlinput(int, const struct sockaddr *, void *);
 void   raw_detach(struct socket *);
 void   raw_disconnect(struct rawcb *);
-void   raw_input(struct mbuf *, ...);
+void   raw_input(struct mbuf *, struct sockproto *, struct sockaddr *,
+           struct sockaddr *, struct rawcbhead *);
 int    raw_usrreq(struct socket *,
            int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
 void   raw_setsockaddr(struct rawcb *, struct sockaddr *);
diff -r 167da641b120 -r 013c3835ec5e sys/net/raw_usrreq.c
--- a/sys/net/raw_usrreq.c      Fri Sep 07 06:08:16 2018 +0000
+++ b/sys/net/raw_usrreq.c      Fri Sep 07 06:13:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_usrreq.c,v 1.61 2018/05/09 06:35:10 maxv Exp $     */
+/*     $NetBSD: raw_usrreq.c,v 1.62 2018/09/07 06:13:14 maxv Exp $     */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.61 2018/05/09 06:35:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_usrreq.c,v 1.62 2018/09/07 06:13:14 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -65,22 +65,12 @@
  * If nothing exists for this packet, drop it.
  */
 void
-raw_input(struct mbuf *m0, ...)
+raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src,
+    struct sockaddr *dst, struct rawcbhead *rawcbhead)
 {
        struct rawcb *rp;
        struct mbuf *m = m0;
        struct socket *last;
-       va_list ap;
-       struct sockproto *proto;
-       struct sockaddr *src, *dst;
-       struct rawcbhead *rawcbhead;
-
-       va_start(ap, m0);
-       proto = va_arg(ap, struct sockproto *);
-       src = va_arg(ap, struct sockaddr *);
-       dst = va_arg(ap, struct sockaddr *);
-       rawcbhead = va_arg(ap, struct rawcbhead *);
-       va_end(ap);
 
        last = NULL;
        LIST_FOREACH(rp, rawcbhead, rcb_list) {



Home | Main Index | Thread Index | Old Index