Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys prototype must not have variable name
details: https://anonhg.NetBSD.org/src/rev/a68072b6631e
branches: trunk
changeset: 549233:a68072b6631e
user: itojun <itojun%NetBSD.org@localhost>
date: Tue Jul 08 07:13:50 2003 +0000
description:
prototype must not have variable name
diffstat:
sys/net/if_bridgevar.h | 6 +-
sys/net/if_gre.h | 6 +-
sys/net/if_media.h | 21 +++----
sys/net/if_pppvar.h | 19 +++---
sys/net/if_spppvar.h | 30 +++++-----
sys/net/ppp-comp.h | 32 +++++-------
sys/net/zlib.h | 125 +++++++++++++++++++-----------------------------
sys/netinet6/ip6_var.h | 4 +-
sys/netinet6/ipsec.h | 16 ++---
9 files changed, 114 insertions(+), 145 deletions(-)
diffs (truncated from 727 to 300 lines):
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/if_bridgevar.h
--- a/sys/net/if_bridgevar.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/if_bridgevar.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridgevar.h,v 1.3 2003/03/19 10:34:34 bouyer Exp $ */
+/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -301,9 +301,9 @@
extern const uint8_t bstp_etheraddr[];
-void bridge_ifdetach(struct ifnet *ifp);
+void bridge_ifdetach(struct ifnet *);
-int bridge_output(struct ifnet *ifp, struct mbuf *, struct sockaddr *,
+int bridge_output(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
struct mbuf *bridge_input(struct ifnet *, struct mbuf *);
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/if_gre.h
--- a/sys/net/if_gre.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/if_gre.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.h,v 1.10 2002/02/24 17:22:20 martin Exp $ */
+/* $NetBSD: if_gre.h,v 1.11 2003/07/08 07:13:51 itojun Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -153,8 +153,8 @@
int gre_ioctl __P((struct ifnet *, u_long, caddr_t));
int gre_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
- struct rtentry *rt));
-u_short gre_in_cksum(u_short *p, u_int len);
+ struct rtentry *));
+u_short gre_in_cksum(u_short *, u_int);
#endif /* _KERNEL */
#endif
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/if_media.h
--- a/sys/net/if_media.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/if_media.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.34 2003/04/23 23:16:43 bjh21 Exp $ */
+/* $NetBSD: if_media.h,v 1.35 2003/07/08 07:13:51 itojun Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -93,8 +93,8 @@
/*
* Driver callbacks for media status and change requests.
*/
-typedef int (*ifm_change_cb_t) __P((struct ifnet *ifp));
-typedef void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req));
+typedef int (*ifm_change_cb_t) __P((struct ifnet *));
+typedef void (*ifm_stat_cb_t) __P((struct ifnet *, struct ifmediareq *));
/*
* In-kernel representation of a single supported media type.
@@ -120,25 +120,24 @@
};
/* Initialize an interface's struct if_media field. */
-void ifmedia_init __P((struct ifmedia *ifm, int dontcare_mask,
- ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback));
+void ifmedia_init __P((struct ifmedia *, int, ifm_change_cb_t,
+ ifm_stat_cb_t));
/* Add one supported medium to a struct ifmedia. */
-void ifmedia_add __P((struct ifmedia *ifm, int mword, int data, void *aux));
+void ifmedia_add __P((struct ifmedia *, int, int, void *));
/* Add an array (of ifmedia_entry) media to a struct ifmedia. */
-void ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp,
- int count);
+void ifmedia_list_add(struct ifmedia *, struct ifmedia_entry *, int);
/* Set default media type on initialization. */
void ifmedia_set __P((struct ifmedia *ifm, int mword));
/* Common ioctl function for getting/setting media, called by driver. */
-int ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr,
- struct ifmedia *ifm, u_long cmd));
+int ifmedia_ioctl __P((struct ifnet *, struct ifreq *, struct ifmedia *,
+ u_long));
/* Look up a media entry. */
-struct ifmedia_entry *ifmedia_match __P((struct ifmedia *ifm, u_int, u_int));
+struct ifmedia_entry *ifmedia_match __P((struct ifmedia *, u_int, u_int));
/* Delete all media for a given media instance */
void ifmedia_delete_instance __P((struct ifmedia *, u_int));
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/if_pppvar.h
--- a/sys/net/if_pppvar.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/if_pppvar.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppvar.h,v 1.16 2002/09/13 14:32:11 itojun Exp $ */
+/* $NetBSD: if_pppvar.h,v 1.17 2003/07/08 07:13:51 itojun Exp $ */
/* Id: if_pppvar.h,v 1.3 1996/07/01 01:04:37 paulus Exp */
/*
@@ -148,15 +148,14 @@
#ifdef _KERNEL
extern struct ppp_softc ppp_softc[];
-struct ppp_softc *pppalloc __P((pid_t pid));
-void pppdealloc __P((struct ppp_softc *sc));
-int pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p));
-void ppp_restart __P((struct ppp_softc *sc));
-void ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));
-struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));
-int pppoutput __P((struct ifnet *, struct mbuf *,
- struct sockaddr *, struct rtentry *));
+struct ppp_softc *pppalloc __P((pid_t));
+void pppdealloc __P((struct ppp_softc *));
+int pppioctl __P((struct ppp_softc *, u_long, caddr_t, int, struct proc *));
+void ppp_restart __P((struct ppp_softc *));
+void ppppktin __P((struct ppp_softc *, struct mbuf *, int));
+struct mbuf *ppp_dequeue __P((struct ppp_softc *));
+int pppoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
+ struct rtentry *));
#endif /* _KERNEL */
#endif /* _NET_IF_PPPVAR_H_ */
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/if_spppvar.h
--- a/sys/net/if_spppvar.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/if_spppvar.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppvar.h,v 1.7 2003/01/28 15:36:40 tron Exp $ */
+/* $NetBSD: if_spppvar.h,v 1.8 2003/07/08 07:13:52 itojun Exp $ */
/*
* Defines for synchronous PPP/Cisco link level subroutines.
@@ -119,16 +119,16 @@
* ready to communicate (like hardware HDLC) can shortcut
* pp_up from pp_tls, and pp_down from pp_tlf.
*/
- void (*pp_up)(struct sppp *sp);
- void (*pp_down)(struct sppp *sp);
+ void (*pp_up)(struct sppp *);
+ void (*pp_down)(struct sppp *);
/*
* These functions need to be filled in by the lower layer
* (hardware) drivers if they request notification from the
* PPP layer whether the link is actually required. They
* correspond to the tls and tlf actions.
*/
- void (*pp_tls)(struct sppp *sp);
- void (*pp_tlf)(struct sppp *sp);
+ void (*pp_tls)(struct sppp *);
+ void (*pp_tlf)(struct sppp *);
/*
* These (optional) functions may be filled by the hardware
* driver if any notification of established connections
@@ -136,8 +136,8 @@
* state change of the interface state machine should be
* signaled for monitoring purposes (pp_chg).
*/
- void (*pp_con)(struct sppp *sp);
- void (*pp_chg)(struct sppp *sp, int new_state);
+ void (*pp_con)(struct sppp *);
+ void (*pp_chg)(struct sppp *, int);
};
#define PP_KEEPALIVE 0x01 /* use keepalive protocol */
@@ -154,12 +154,12 @@
#define PP_MAX_MRU 2048 /* maximal MRU we want to negotiate */
#ifdef _KERNEL
-void sppp_attach (struct ifnet *ifp);
-void sppp_detach (struct ifnet *ifp);
-void sppp_input (struct ifnet *ifp, struct mbuf *m);
-int sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data);
-struct mbuf *sppp_dequeue (struct ifnet *ifp);
-struct mbuf *sppp_pick(struct ifnet *ifp);
-int sppp_isempty (struct ifnet *ifp);
-void sppp_flush (struct ifnet *ifp);
+void sppp_attach (struct ifnet *);
+void sppp_detach (struct ifnet *);
+void sppp_input (struct ifnet *, struct mbuf *);
+int sppp_ioctl(struct ifnet *, u_long, void *);
+struct mbuf *sppp_dequeue (struct ifnet *);
+struct mbuf *sppp_pick(struct ifnet *);
+int sppp_isempty (struct ifnet *);
+void sppp_flush (struct ifnet *);
#endif
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/ppp-comp.h
--- a/sys/net/ppp-comp.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/ppp-comp.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ppp-comp.h,v 1.9 2003/03/27 17:50:28 christos Exp $ */
+/* $NetBSD: ppp-comp.h,v 1.10 2003/07/08 07:13:52 itojun Exp $ */
/*
* ppp-comp.h - Definitions for doing PPP packet compression.
@@ -66,36 +66,32 @@
int compress_proto; /* CCP compression protocol number */
/* Allocate space for a compressor (transmit side) */
- void *(*comp_alloc) __P((u_char *options, int opt_len));
+ void *(*comp_alloc) __P((u_char *, int));
/* Free space used by a compressor */
- void (*comp_free) __P((void *state));
+ void (*comp_free) __P((void *));
/* Initialize a compressor */
- int (*comp_init) __P((void *state, u_char *options, int opt_len,
- int unit, int hdrlen, int debug));
+ int (*comp_init) __P((void *, u_char *, int, int, int, int));
/* Reset a compressor */
- void (*comp_reset) __P((void *state));
+ void (*comp_reset) __P((void *));
/* Compress a packet */
- int (*compress) __P((void *state, PACKETPTR *mret,
- PACKETPTR mp, int orig_len, int max_len));
+ int (*compress) __P((void *, PACKETPTR *, PACKETPTR, int, int));
/* Return compression statistics */
- void (*comp_stat) __P((void *state, struct compstat *stats));
+ void (*comp_stat) __P((void *, struct compstat *));
/* Allocate space for a decompressor (receive side) */
- void *(*decomp_alloc) __P((u_char *options, int opt_len));
+ void *(*decomp_alloc) __P((u_char *, int));
/* Free space used by a decompressor */
- void (*decomp_free) __P((void *state));
+ void (*decomp_free) __P((void *));
/* Initialize a decompressor */
- int (*decomp_init) __P((void *state, u_char *options, int opt_len,
- int unit, int hdrlen, int mru, int debug));
+ int (*decomp_init) __P((void *, u_char *, int, int, int, int, int));
/* Reset a decompressor */
- void (*decomp_reset) __P((void *state));
+ void (*decomp_reset) __P((void *));
/* Decompress a packet. */
- int (*decompress) __P((void *state, PACKETPTR mp,
- PACKETPTR *dmpp));
+ int (*decompress) __P((void *, PACKETPTR, PACKETPTR *));
/* Update state for an incompressible packet received */
- void (*incomp) __P((void *state, PACKETPTR mp));
+ void (*incomp) __P((void *, PACKETPTR));
/* Return decompression statistics */
- void (*decomp_stat) __P((void *state, struct compstat *stats));
+ void (*decomp_stat) __P((void *, struct compstat *));
};
#endif /* PACKETPTR */
diff -r f4c92d8e24a0 -r a68072b6631e sys/net/zlib.h
--- a/sys/net/zlib.h Tue Jul 08 06:49:19 2003 +0000
+++ b/sys/net/zlib.h Tue Jul 08 07:13:50 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: zlib.h,v 1.6 2002/03/13 03:59:35 fvdl Exp $ */
+/* $NetBSD: zlib.h,v 1.7 2003/07/08 07:13:52 itojun Exp $ */
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.1.4, March 11th, 2002
@@ -43,7 +43,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id: zlib.h,v 1.6 2002/03/13 03:59:35 fvdl Exp $ */
+/* @(#) $Id: zlib.h,v 1.7 2003/07/08 07:13:52 itojun Exp $ */
#ifndef _ZCONF_H
#define _ZCONF_H
@@ -351,8 +351,8 @@
crash even in case of corrupted input.
*/
-typedef voidpf (*alloc_func) __P((voidpf opaque, uInt items, uInt size));
-typedef void (*free_func) __P((voidpf opaque, voidpf address));
+typedef voidpf (*alloc_func) __P((voidpf, uInt, uInt));
+typedef void (*free_func) __P((voidpf, voidpf));
struct internal_state;
@@ -468,7 +468,7 @@
*/
/*
-ZEXTERN int ZEXPORT deflateInit __P((z_streamp strm, int level));
+ZEXTERN int ZEXPORT deflateInit __P((z_streamp, int));
Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller.
@@ -490,7 +490,7 @@
*/
-ZEXTERN int ZEXPORT deflate __P((z_streamp strm, int flush));
+ZEXTERN int ZEXPORT deflate __P((z_streamp, int));
/*
deflate compresses as much data as possible, and stops when the input
buffer becomes empty or the output buffer becomes full. It may introduce some
@@ -575,7 +575,7 @@
*/
-ZEXTERN int ZEXPORT deflateEnd __P((z_streamp strm));
Home |
Main Index |
Thread Index |
Old Index