Fixed some style bugs in the removal of __P(()). The main ones were
not removing tabs before "__P((", and not outdenting continuation lines to preserve non-KNF lining up of code with parentheses. Switch to KNF formatting and/or rewrap the whole prototype in some cases.
This commit is contained in:
parent
e10bdff354
commit
34fe62c776
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=93084
@ -132,20 +132,19 @@ static void bsd_clear(struct bsd_db *db);
|
||||
static int bsd_check(struct bsd_db *db);
|
||||
static void *bsd_alloc(u_char *options, int opt_len, int decomp);
|
||||
static int bsd_init(struct bsd_db *db, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int mru, int debug,
|
||||
int decomp);
|
||||
int unit, int hdrlen, int mru, int debug, int decomp);
|
||||
static void *bsd_comp_alloc(u_char *options, int opt_len);
|
||||
static void *bsd_decomp_alloc(u_char *options, int opt_len);
|
||||
static void bsd_free(void *state);
|
||||
static int bsd_comp_init(void *state, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int debug);
|
||||
int unit, int hdrlen, int debug);
|
||||
static int bsd_decomp_init(void *state, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int mru, int debug);
|
||||
static int bsd_compress(void *state, struct mbuf **mret,
|
||||
struct mbuf *mp, int slen, int maxolen);
|
||||
int unit, int hdrlen, int mru, int debug);
|
||||
static int bsd_compress(void *state, struct mbuf **mret, struct mbuf *mp,
|
||||
int slen, int maxolen);
|
||||
static void bsd_incomp(void *state, struct mbuf *dmsg);
|
||||
static int bsd_decompress(void *state, struct mbuf *cmp,
|
||||
struct mbuf **dmpp);
|
||||
struct mbuf **dmpp);
|
||||
static void bsd_reset(void *state);
|
||||
static void bsd_comp_stats(void *state, struct compstat *stats);
|
||||
|
||||
|
@ -119,7 +119,7 @@ bdgtakeifaces_t *bdgtakeifaces_ptr;
|
||||
struct bdg_softc *ifp2sc;
|
||||
|
||||
static int ether_resolvemulti(struct ifnet *, struct sockaddr **,
|
||||
struct sockaddr *);
|
||||
struct sockaddr *);
|
||||
u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
||||
#define senderr(e) do { error = (e); goto bad;} while (0)
|
||||
#define IFP2AC(IFP) ((struct arpcom *)IFP)
|
||||
|
@ -95,7 +95,7 @@ extern u_char aarp_org_code[ 3 ];
|
||||
#endif /* NETATALK */
|
||||
|
||||
static int fddi_resolvemulti(struct ifnet *, struct sockaddr **,
|
||||
struct sockaddr *);
|
||||
struct sockaddr *);
|
||||
|
||||
#define senderr(e) { error = (e); goto bad;}
|
||||
|
||||
|
@ -83,8 +83,8 @@ struct gif_softc {
|
||||
|
||||
/* Prototypes */
|
||||
void gif_input(struct mbuf *, int, struct ifnet *);
|
||||
int gif_output(struct ifnet *, struct mbuf *,
|
||||
struct sockaddr *, struct rtentry *);
|
||||
int gif_output(struct ifnet *, struct mbuf *, struct sockaddr *,
|
||||
struct rtentry *);
|
||||
int gif_ioctl(struct ifnet *, u_long, caddr_t);
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
@ -100,10 +100,10 @@ struct ppp_softc {
|
||||
|
||||
struct ppp_softc *pppalloc(pid_t pid);
|
||||
void pppdealloc(struct ppp_softc *sc);
|
||||
int pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data,
|
||||
int flag, struct thread *td);
|
||||
int pppoutput(struct ifnet *ifp, struct mbuf *m0,
|
||||
struct sockaddr *dst, struct rtentry *rtp);
|
||||
int pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, int flag,
|
||||
struct thread *td);
|
||||
int pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
|
||||
struct rtentry *rtp);
|
||||
void ppp_restart(struct ppp_softc *sc);
|
||||
void ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost);
|
||||
struct mbuf *ppp_dequeue(struct ppp_softc *sc);
|
||||
|
@ -81,16 +81,16 @@
|
||||
/* 0x007f00ff */
|
||||
|
||||
/* module */
|
||||
static int tapmodevent (module_t, int, void *);
|
||||
static int tapmodevent(module_t, int, void *);
|
||||
|
||||
/* device */
|
||||
static void tapclone (void *, char *, int, dev_t *);
|
||||
static void tapcreate (dev_t);
|
||||
static void tapclone(void *, char *, int, dev_t *);
|
||||
static void tapcreate(dev_t);
|
||||
|
||||
/* network interface */
|
||||
static void tapifstart (struct ifnet *);
|
||||
static int tapifioctl (struct ifnet *, u_long, caddr_t);
|
||||
static void tapifinit (void *);
|
||||
static void tapifstart(struct ifnet *);
|
||||
static int tapifioctl(struct ifnet *, u_long, caddr_t);
|
||||
static void tapifinit(void *);
|
||||
|
||||
/* character device */
|
||||
static d_open_t tapopen;
|
||||
|
@ -42,8 +42,7 @@ struct ifnet;
|
||||
*/
|
||||
struct packet_filter_hook {
|
||||
TAILQ_ENTRY(packet_filter_hook) pfil_link;
|
||||
int (*pfil_func)(void *, int, struct ifnet *, int,
|
||||
struct mbuf **);
|
||||
int (*pfil_func)(void *, int, struct ifnet *, int, struct mbuf **);
|
||||
int pfil_flags;
|
||||
};
|
||||
|
||||
|
@ -43,12 +43,12 @@ struct compressor {
|
||||
void (*comp_free)(void *state);
|
||||
/* Initialize a compressor */
|
||||
int (*comp_init)(void *state, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int debug);
|
||||
int unit, int hdrlen, int debug);
|
||||
/* Reset a compressor */
|
||||
void (*comp_reset)(void *state);
|
||||
/* Compress a packet */
|
||||
int (*compress)(void *state, PACKETPTR *mret,
|
||||
PACKETPTR mp, int orig_len, int max_len);
|
||||
int (*compress)(void *state, PACKETPTR *mret, PACKETPTR mp,
|
||||
int orig_len, int max_len);
|
||||
/* Return compression statistics */
|
||||
void (*comp_stat)(void *state, struct compstat *stats);
|
||||
|
||||
@ -58,12 +58,11 @@ struct compressor {
|
||||
void (*decomp_free)(void *state);
|
||||
/* Initialize a decompressor */
|
||||
int (*decomp_init)(void *state, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int mru, int debug);
|
||||
int unit, int hdrlen, int mru, int debug);
|
||||
/* Reset a decompressor */
|
||||
void (*decomp_reset)(void *state);
|
||||
/* Decompress a packet. */
|
||||
int (*decompress)(void *state, PACKETPTR mp,
|
||||
PACKETPTR *dmpp);
|
||||
int (*decompress)(void *state, PACKETPTR mp, PACKETPTR *dmpp);
|
||||
/* Update state for an incompressible packet received */
|
||||
void (*incomp)(void *state, PACKETPTR mp);
|
||||
/* Return decompression statistics */
|
||||
|
@ -67,14 +67,13 @@ static void *z_decomp_alloc(u_char *options, int opt_len);
|
||||
static void z_comp_free(void *state);
|
||||
static void z_decomp_free(void *state);
|
||||
static int z_comp_init(void *state, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int debug);
|
||||
int unit, int hdrlen, int debug);
|
||||
static int z_decomp_init(void *state, u_char *options, int opt_len,
|
||||
int unit, int hdrlen, int mru, int debug);
|
||||
static int z_compress(void *state, struct mbuf **mret,
|
||||
struct mbuf *mp, int slen, int maxolen);
|
||||
int unit, int hdrlen, int mru, int debug);
|
||||
static int z_compress(void *state, struct mbuf **mret, struct mbuf *mp,
|
||||
int slen, int maxolen);
|
||||
static void z_incomp(void *state, struct mbuf *dmsg);
|
||||
static int z_decompress(void *state, struct mbuf *cmp,
|
||||
struct mbuf **dmpp);
|
||||
static int z_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp);
|
||||
static void z_comp_reset(void *state);
|
||||
static void z_decomp_reset(void *state);
|
||||
static void z_comp_stats(void *state, struct compstat *stats);
|
||||
|
@ -51,12 +51,12 @@
|
||||
#include <net/radix.h>
|
||||
#endif
|
||||
|
||||
static int rn_walktree_from(struct radix_node_head *h, void *a,
|
||||
void *m, walktree_f_t *f, void *w);
|
||||
static int rn_walktree_from(struct radix_node_head *h, void *a, void *m,
|
||||
walktree_f_t *f, void *w);
|
||||
static int rn_walktree(struct radix_node_head *, walktree_f_t *, void *);
|
||||
static struct radix_node
|
||||
*rn_insert(void *, struct radix_node_head *, int *,
|
||||
struct radix_node [2]),
|
||||
struct radix_node [2]),
|
||||
*rn_newpair(void *, int, struct radix_node[2]),
|
||||
*rn_search(void *, struct radix_node *),
|
||||
*rn_search_m(void *, struct radix_node *, void *);
|
||||
@ -76,9 +76,9 @@ static char *rn_zeros, *rn_ones;
|
||||
static int rn_lexobetter(void *m_arg, void *n_arg);
|
||||
static struct radix_mask *
|
||||
rn_new_radix_mask(struct radix_node *tt,
|
||||
struct radix_mask *next);
|
||||
struct radix_mask *next);
|
||||
static int rn_satsifies_leaf(char *trial, struct radix_node *leaf,
|
||||
int skip);
|
||||
int skip);
|
||||
|
||||
/*
|
||||
* The data structure for the keys is a radix tree with one way
|
||||
|
@ -109,8 +109,8 @@ struct rtentry {
|
||||
caddr_t rt_llinfo; /* pointer to link level info cache */
|
||||
struct rt_metrics rt_rmx; /* metrics used by rx'ing protocols */
|
||||
struct rtentry *rt_gwroute; /* implied entry for gatewayed routes */
|
||||
int (*rt_output)(struct ifnet *, struct mbuf *,
|
||||
struct sockaddr *, struct rtentry *);
|
||||
int (*rt_output)(struct ifnet *, struct mbuf *, struct sockaddr *,
|
||||
struct rtentry *);
|
||||
/* output routine for this (rt,if) */
|
||||
struct rtentry *rt_parent; /* cloning parent of this route */
|
||||
void *rt_filler2; /* more filler */
|
||||
|
Loading…
Reference in New Issue
Block a user