From 08b29601a0912b1c242b382d708aff768780d17e Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 16 Oct 2002 10:45:53 +0000 Subject: [PATCH] Be consistent about functions being static. Spotted by: FlexeLint --- sys/net/bsd_comp.c | 4 ++-- sys/net/if_arcsubr.c | 2 +- sys/net/if_sl.c | 2 +- sys/net/if_spppsubr.c | 4 ++-- sys/net/if_tap.c | 2 +- sys/net/ppp_deflate.c | 8 ++++---- sys/net/ppp_tty.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index 910e27a9f9ae..dd6ab5617933 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -468,7 +468,7 @@ bsd_decomp_init(state, options, opt_len, unit, hdrlen, mru, debug) * One change from the BSD compress command is that when the * code size expands, we do not output a bunch of padding. */ -int /* new slen */ +static int /* new slen */ bsd_compress(state, mret, mp, slen, maxolen) void *state; struct mbuf **mret; /* return compressed mbuf chain here */ @@ -815,7 +815,7 @@ bsd_incomp(state, dmsg) * bug, so we return DECOMP_FATALERROR for them in order to turn off * compression, even though they are detected by inspecting the input. */ -int +static int bsd_decompress(state, cmp, dmpp) void *state; struct mbuf *cmp, **dmpp; diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index d3a482a7dc4e..affd7dd49f34 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -353,7 +353,7 @@ arc_frag_next(ifp) * NULL. frees imcoming mbuf as necessary. */ -__inline struct mbuf * +static __inline struct mbuf * arc_defrag(ifp, m) struct ifnet *ifp; struct mbuf *m; diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index cae79151296b..7502d7ec81a2 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -379,7 +379,7 @@ slopen(dev, tp) return (0); } -void +static void sldestroy(struct sl_softc *sc) { bpfdetach(&sc->sc_if); diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 3709f71289b0..61dbb6faf5a9 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -2075,7 +2075,7 @@ sppp_to_event(const struct cp *cp, struct sppp *sp) * Change the state of a control protocol in the state automaton. * Takes care of starting/stopping the restart timer. */ -void +static void sppp_cp_change_state(const struct cp *cp, struct sppp *sp, int newstate) { sp->state[cp->protoidx] = newstate; @@ -3876,7 +3876,7 @@ static void sppp_ipv6cp_scr(struct sppp *sp) /* * Handle incoming CHAP packets. */ -void +static void sppp_chap_input(struct sppp *sp, struct mbuf *m) { STDDCL; diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index 5cdeaf718470..5b2f8f03152a 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -535,7 +535,7 @@ tapifinit(xtp) * * Process an ioctl request on network interface */ -int +static int tapifioctl(ifp, cmd, data) struct ifnet *ifp; u_long cmd; diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c index 37533de001e9..3c7884e033d7 100644 --- a/sys/net/ppp_deflate.c +++ b/sys/net/ppp_deflate.c @@ -118,7 +118,7 @@ struct compressor ppp_deflate_draft = { /* * Space allocation and freeing routines for use by zlib routines. */ -void * +static void * z_alloc(notused, items, size) void *notused; u_int items, size; @@ -129,7 +129,7 @@ z_alloc(notused, items, size) return ptr; } -void +static void z_free(notused, ptr) void *notused; void *ptr; @@ -223,7 +223,7 @@ z_comp_reset(arg) deflateReset(&state->strm); } -int +static int z_compress(arg, mret, mp, orig_len, maxolen) void *arg; struct mbuf **mret; /* compressed packet (out) */ @@ -469,7 +469,7 @@ z_decomp_reset(arg) * bug, so we return DECOMP_FATALERROR for them in order to turn off * compression, even though they are detected by inspecting the input. */ -int +static int z_decompress(arg, mi, mop) void *arg; struct mbuf *mi, **mop; diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index b45bd4481e0b..be3ec820edf0 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -752,7 +752,7 @@ pppasyncctlp(sc) * called later at splsoftnet. * Called at spltty or higher. */ -int +static int pppstart(tp) register struct tty *tp; {