Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netiso De-__P the header files (and reorder the includes...
details: https://anonhg.NetBSD.org/src/rev/4aaeead8653f
branches: trunk
changeset: 565764:4aaeead8653f
user: matt <matt%NetBSD.org@localhost>
date: Tue Apr 20 02:13:26 2004 +0000
description:
De-__P the header files (and reorder the includes of some C files).
diffstat:
sys/netiso/argo_debug.h | 4 +-
sys/netiso/clnl.h | 4 +-
sys/netiso/cltp_var.h | 16 +-
sys/netiso/eonvar.h | 20 ++--
sys/netiso/esis.h | 36 +++---
sys/netiso/idrp_var.h | 12 +-
sys/netiso/iso_pcb.h | 20 ++--
sys/netiso/tp_driver.c | 6 +-
sys/netiso/tp_input.c | 6 +-
sys/netiso/tp_output.c | 6 +-
sys/netiso/tp_pcb.h | 32 +++---
sys/netiso/tp_usrreq.c | 8 +-
sys/netiso/tp_var.h | 221 +++++++++++++++++++++++------------------------
13 files changed, 195 insertions(+), 196 deletions(-)
diffs (truncated from 656 to 300 lines):
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/argo_debug.h
--- a/sys/netiso/argo_debug.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/argo_debug.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: argo_debug.h,v 1.12 2003/08/07 16:33:31 agc Exp $ */
+/* $NetBSD: argo_debug.h,v 1.13 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -60,7 +60,7 @@
#ifndef _NETISO_ARGO_DEBUG_H_
#define _NETISO_ARGO_DEBUG_H_
-void Dump_buf __P((caddr_t, int));
+void Dump_buf (caddr_t, int);
#define dump_buf(a, b) Dump_buf((caddr_t)(a), (int)(b))
/***********************************************
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/clnl.h
--- a/sys/netiso/clnl.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/clnl.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clnl.h,v 1.7 2003/08/07 16:33:32 agc Exp $ */
+/* $NetBSD: clnl.h,v 1.8 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -59,5 +59,5 @@
*/
struct clnl_protosw {
/* input routine */
- void (*clnl_input) __P((struct mbuf *, ...));
+ void (*clnl_input) (struct mbuf *, ...);
};
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/cltp_var.h
--- a/sys/netiso/cltp_var.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/cltp_var.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cltp_var.h,v 1.12 2003/08/07 16:33:34 agc Exp $ */
+/* $NetBSD: cltp_var.h,v 1.13 2004/04/20 02:13:26 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -51,11 +51,11 @@
extern struct cltpstat cltpstat;
/* cltp_usrreq.c */
-void cltp_init __P((void));
-void cltp_input __P((struct mbuf *, ...));
-void cltp_notify __P((struct isopcb *));
-void cltp_ctlinput __P((int, struct sockaddr *, void *));
-int cltp_output __P((struct mbuf *, ...));
-int cltp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *, struct proc *));
+void cltp_init (void);
+void cltp_input (struct mbuf *, ...);
+void cltp_notify (struct isopcb *);
+void cltp_ctlinput (int, struct sockaddr *, void *);
+int cltp_output (struct mbuf *, ...);
+int cltp_usrreq (struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *, struct proc *);
#endif
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/eonvar.h
--- a/sys/netiso/eonvar.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/eonvar.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eonvar.h,v 1.11 2003/08/07 16:33:34 agc Exp $ */
+/* $NetBSD: eonvar.h,v 1.12 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -173,13 +173,13 @@
#define el_eonhdr el_ei.ei_eh
#ifdef _KERNEL
-void eonprotoinit __P((void));
-void eonattach __P((void));
-int eonioctl __P((struct ifnet *, u_long, caddr_t));
-void eoniphdr __P((struct eon_iphdr *, caddr_t, struct route *, int, int));
-void eonrtrequest __P((int, struct rtentry *, struct rt_addrinfo *));
-int eonoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- struct rtentry *));
-void eoninput __P((struct mbuf *, ...));
-void *eonctlinput __P((int, struct sockaddr *, void *));
+void eonprotoinit (void);
+void eonattach (void);
+int eonioctl (struct ifnet *, u_long, caddr_t);
+void eoniphdr (struct eon_iphdr *, caddr_t, struct route *, int, int);
+void eonrtrequest (int, struct rtentry *, struct rt_addrinfo *);
+int eonoutput (struct ifnet *, struct mbuf *, struct sockaddr *,
+ struct rtentry *);
+void eoninput (struct mbuf *, ...);
+void *eonctlinput (int, struct sockaddr *, void *);
#endif
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/esis.h
--- a/sys/netiso/esis.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/esis.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esis.h,v 1.15 2003/08/07 16:33:35 agc Exp $ */
+/* $NetBSD: esis.h,v 1.16 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -125,21 +125,21 @@
struct rtentry;
struct sockaddr_dl;
-void esis_init __P((void));
-int esis_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *, struct proc *));
-void esis_input __P((struct mbuf *, ...));
-void esis_rdoutput __P((struct snpa_hdr *, struct mbuf *, struct clnp_optidx *,
- struct iso_addr *, struct rtentry *));
-int esis_insert_addr __P((caddr_t *, int *, struct iso_addr *, struct mbuf *,
- int));
-void esis_eshinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_ishinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_rdinput __P((struct mbuf *, struct snpa_hdr *));
-void esis_config __P((void *));
-void esis_shoutput __P((struct ifnet *, int, int, caddr_t, int,
- struct iso_addr *));
-void isis_input __P((struct mbuf *, ...));
-int isis_output __P((struct mbuf *, ...));
-void *esis_ctlinput __P((int, struct sockaddr *, void *));
+void esis_init (void);
+int esis_usrreq (struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *, struct proc *);
+void esis_input (struct mbuf *, ...);
+void esis_rdoutput (struct snpa_hdr *, struct mbuf *, struct clnp_optidx *,
+ struct iso_addr *, struct rtentry *);
+int esis_insert_addr (caddr_t *, int *, struct iso_addr *, struct mbuf *,
+ int);
+void esis_eshinput (struct mbuf *, struct snpa_hdr *);
+void esis_ishinput (struct mbuf *, struct snpa_hdr *);
+void esis_rdinput (struct mbuf *, struct snpa_hdr *);
+void esis_config (void *);
+void esis_shoutput (struct ifnet *, int, int, caddr_t, int,
+ struct iso_addr *);
+void isis_input (struct mbuf *, ...);
+int isis_output (struct mbuf *, ...);
+void *esis_ctlinput (int, struct sockaddr *, void *);
#endif /* _KERNEL */
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/idrp_var.h
--- a/sys/netiso/idrp_var.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/idrp_var.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: idrp_var.h,v 1.6 2003/06/29 22:32:05 fvdl Exp $ */
+/* $NetBSD: idrp_var.h,v 1.7 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -40,9 +40,9 @@
struct mbuf;
/* idrp_usrreq.c */
-void idrp_init __P((void));
-void idrp_input __P((struct mbuf *, ...));
-int idrp_output __P((struct mbuf *, ...));
-int idrp_usrreq __P((struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *, struct proc *));
+void idrp_init (void);
+void idrp_input (struct mbuf *, ...);
+int idrp_output (struct mbuf *, ...);
+int idrp_usrreq (struct socket *, int, struct mbuf *, struct mbuf *,
+ struct mbuf *, struct proc *);
#endif
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/iso_pcb.h
--- a/sys/netiso/iso_pcb.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/iso_pcb.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iso_pcb.h,v 1.10 2003/08/07 16:33:37 agc Exp $ */
+/* $NetBSD: iso_pcb.h,v 1.11 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -114,13 +114,13 @@
struct mbuf;
struct sockaddr_iso;
-int iso_pcballoc __P((struct socket *, void *));
-int iso_pcbbind __P((void *, struct mbuf *, struct proc *));
-int iso_pcbconnect __P((void *, struct mbuf *));
-void iso_pcbdisconnect __P((void *));
-void iso_pcbdetach __P((void *));
-void iso_pcbnotify __P((struct isopcb *, struct sockaddr_iso *, int,
- void (*) (struct isopcb *)));
-struct isopcb *iso_pcblookup __P((struct isopcb *, int, caddr_t,
- struct sockaddr_iso *));
+int iso_pcballoc (struct socket *, void *);
+int iso_pcbbind (void *, struct mbuf *, struct proc *);
+int iso_pcbconnect (void *, struct mbuf *);
+void iso_pcbdisconnect (void *);
+void iso_pcbdetach (void *);
+void iso_pcbnotify (struct isopcb *, struct sockaddr_iso *, int,
+ void (*) (struct isopcb *));
+struct isopcb *iso_pcblookup (struct isopcb *, int, caddr_t,
+ struct sockaddr_iso *);
#endif
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/tp_driver.c
--- a/sys/netiso/tp_driver.c Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/tp_driver.c Tue Apr 20 02:13:26 2004 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: tp_driver.c,v 1.17 2004/04/19 05:16:46 matt Exp $ */
+/* $NetBSD: tp_driver.c,v 1.18 2004/04/20 02:13:26 matt Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tp_driver.c,v 1.17 2004/04/19 05:16:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tp_driver.c,v 1.18 2004/04/20 02:13:26 matt Exp $");
#include "tp_states.h"
@@ -26,6 +26,7 @@
#include <sys/errno.h>
#include <netiso/tp_param.h>
+#include <netiso/tp_var.h>
#include <netiso/tp_stat.h>
#include <netiso/tp_pcb.h>
#include <netiso/tp_tpdu.h>
@@ -33,7 +34,6 @@
#include <netiso/tp_trace.h>
#include <netiso/iso_errno.h>
#include <netiso/tp_seq.h>
-#include <netiso/tp_var.h>
#include <netiso/cons.h>
#define DRIVERTRACE TPPTdriver
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/tp_input.c
--- a/sys/netiso/tp_input.c Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/tp_input.c Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tp_input.c,v 1.18 2004/04/19 05:16:46 matt Exp $ */
+/* $NetBSD: tp_input.c,v 1.19 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tp_input.c,v 1.18 2004/04/19 05:16:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tp_input.c,v 1.19 2004/04/20 02:13:26 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,13 +98,13 @@
#include <netiso/iso_errno.h>
#include <netiso/iso_pcb.h>
#include <netiso/tp_param.h>
+#include <netiso/tp_var.h>
#include <netiso/tp_timer.h>
#include <netiso/tp_stat.h>
#include <netiso/tp_pcb.h>
#include <netiso/argo_debug.h>
#include <netiso/tp_trace.h>
#include <netiso/tp_tpdu.h>
-#include <netiso/tp_var.h>
#include <netiso/iso_var.h>
#ifdef TRUE
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/tp_output.c
--- a/sys/netiso/tp_output.c Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/tp_output.c Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tp_output.c,v 1.25 2004/04/19 05:16:46 matt Exp $ */
+/* $NetBSD: tp_output.c,v 1.26 2004/04/20 02:13:26 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tp_output.c,v 1.25 2004/04/19 05:16:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tp_output.c,v 1.26 2004/04/20 02:13:26 matt Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@@ -79,6 +79,7 @@
#include <sys/proc.h>
#include <netiso/tp_param.h>
+#include <netiso/tp_var.h>
#include <netiso/tp_user.h>
#include <netiso/tp_stat.h>
#include <netiso/tp_ip.h>
@@ -87,7 +88,6 @@
#include <netiso/argo_debug.h>
#include <netiso/tp_pcb.h>
#include <netiso/tp_trace.h>
-#include <netiso/tp_var.h>
#define TPDUSIZESHIFT 24
#define CLASSHIFT 16
diff -r ff4aaa0d73d0 -r 4aaeead8653f sys/netiso/tp_pcb.h
--- a/sys/netiso/tp_pcb.h Tue Apr 20 01:43:03 2004 +0000
+++ b/sys/netiso/tp_pcb.h Tue Apr 20 02:13:26 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tp_pcb.h,v 1.15 2003/08/07 16:33:41 agc Exp $ */
+/* $NetBSD: tp_pcb.h,v 1.16 2004/04/20 02:13:26 matt Exp $ */
Home |
Main Index |
Thread Index |
Old Index