Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys s/static inline/static __inline/g for consi...
details: https://anonhg.NetBSD.org/src/rev/aa402f2c98da
branches: trunk
changeset: 318375:aa402f2c98da
user: christos <christos%NetBSD.org@localhost>
date: Thu Apr 19 21:20:43 2018 +0000
description:
s/static inline/static __inline/g for consistency.
diffstat:
sys/net/bpf.h | 28 ++++++++++++++--------------
sys/net/if.h | 14 +++++++-------
sys/net/if_arp.h | 10 +++++-----
sys/net/if_ether.h | 8 ++++----
sys/net/if_gif.h | 8 ++++----
sys/net/if_ipsec.h | 16 ++++++++--------
sys/net/if_l2tp.h | 8 ++++----
sys/net/if_llatbl.h | 4 ++--
sys/net/route.h | 14 +++++++-------
sys/netinet/in.h | 8 ++++----
sys/netinet/in_var.h | 18 +++++++++---------
sys/netinet/tcp_vtw.h | 18 +++++++++---------
sys/netinet6/in6.h | 8 ++++----
sys/netinet6/in6_var.h | 12 ++++++------
14 files changed, 87 insertions(+), 87 deletions(-)
diffs (truncated from 750 to 300 lines):
diff -r f393ff024f6d -r aa402f2c98da sys/net/bpf.h
--- a/sys/net/bpf.h Thu Apr 19 21:19:07 2018 +0000
+++ b/sys/net/bpf.h Thu Apr 19 21:20:43 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.69 2017/01/25 01:04:23 ozaki-r Exp $ */
+/* $NetBSD: bpf.h,v 1.70 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -430,85 +430,85 @@
extern struct bpf_ops *bpf_ops;
-static inline void
+static __inline void
bpf_attach(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen)
{
bpf_ops->bpf_attach(_ifp, _dlt, _hdrlen, &_ifp->if_bpf);
}
-static inline void
+static __inline void
bpf_attach2(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen, struct bpf_if **_dp)
{
bpf_ops->bpf_attach(_ifp, _dlt, _hdrlen, _dp);
}
-static inline void
+static __inline void
bpf_tap(struct ifnet *_ifp, u_char *_pkt, u_int _len)
{
if (_ifp->if_bpf)
bpf_ops->bpf_tap(_ifp->if_bpf, _pkt, _len);
}
-static inline void
+static __inline void
bpf_mtap(struct ifnet *_ifp, struct mbuf *_m)
{
if (_ifp->if_bpf)
bpf_ops->bpf_mtap(_ifp->if_bpf, _m);
}
-static inline void
+static __inline void
bpf_mtap2(struct bpf_if *_bpf, void *_data, u_int _dlen, struct mbuf *_m)
{
bpf_ops->bpf_mtap2(_bpf, _data, _dlen, _m);
}
-static inline void
+static __inline void
bpf_mtap3(struct bpf_if *_bpf, struct mbuf *_m)
{
if (_bpf)
bpf_ops->bpf_mtap(_bpf, _m);
}
-static inline void
+static __inline void
bpf_mtap_af(struct ifnet *_ifp, uint32_t _af, struct mbuf *_m)
{
if (_ifp->if_bpf)
bpf_ops->bpf_mtap_af(_ifp->if_bpf, _af, _m);
}
-static inline void
+static __inline void
bpf_change_type(struct ifnet *_ifp, u_int _dlt, u_int _hdrlen)
{
bpf_ops->bpf_change_type(_ifp, _dlt, _hdrlen);
}
-static inline void
+static __inline void
bpf_detach(struct ifnet *_ifp)
{
bpf_ops->bpf_detach(_ifp);
}
-static inline void
+static __inline void
bpf_mtap_sl_in(struct ifnet *_ifp, u_char *_hdr, struct mbuf **_m)
{
bpf_ops->bpf_mtap_sl_in(_ifp->if_bpf, _hdr, _m);
}
-static inline void
+static __inline void
bpf_mtap_sl_out(struct ifnet *_ifp, u_char *_hdr, struct mbuf *_m)
{
if (_ifp->if_bpf)
bpf_ops->bpf_mtap_sl_out(_ifp->if_bpf, _hdr, _m);
}
-static inline void
+static __inline void
bpf_mtap_softint_init(struct ifnet *_ifp)
{
bpf_ops->bpf_mtap_softint_init(_ifp);
}
-static inline void
+static __inline void
bpf_mtap_softint(struct ifnet *_ifp, struct mbuf *_m)
{
diff -r f393ff024f6d -r aa402f2c98da sys/net/if.h
--- a/sys/net/if.h Thu Apr 19 21:19:07 2018 +0000
+++ b/sys/net/if.h Thu Apr 19 21:20:43 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.259 2018/04/12 04:38:13 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.260 2018/04/19 21:20:43 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -467,14 +467,14 @@
*/
#ifdef _KERNEL
-static inline bool
+static __inline bool
if_is_mpsafe(struct ifnet *ifp)
{
return ((ifp->if_extflags & IFEF_MPSAFE) != 0);
}
-static inline int
+static __inline int
if_output_lock(struct ifnet *cifp, struct ifnet *ifp, struct mbuf *m,
const struct sockaddr *dst, const struct rtentry *rt)
{
@@ -491,7 +491,7 @@
}
}
-static inline void
+static __inline void
if_start_lock(struct ifnet *ifp)
{
@@ -504,7 +504,7 @@
}
}
-static inline bool
+static __inline bool
if_is_link_state_changeable(struct ifnet *ifp)
{
@@ -833,7 +833,7 @@
#define ifreq_getdstaddr ifreq_getaddr
#define ifreq_getbroadaddr ifreq_getaddr
-static inline const struct sockaddr *
+static __inline const struct sockaddr *
/*ARGSUSED*/
ifreq_getaddr(u_long cmd, const struct ifreq *ifr)
{
@@ -1104,7 +1104,7 @@
int if_tunnel_check_nesting(struct ifnet *, struct mbuf *, int);
-static inline if_index_t
+static __inline if_index_t
if_get_index(const struct ifnet *ifp)
{
diff -r f393ff024f6d -r aa402f2c98da sys/net/if_arp.h
--- a/sys/net/if_arp.h Thu Apr 19 21:19:07 2018 +0000
+++ b/sys/net/if_arp.h Thu Apr 19 21:20:43 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.h,v 1.31 2018/02/13 08:43:26 maxv Exp $ */
+/* $NetBSD: if_arp.h,v 1.32 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -73,19 +73,19 @@
#endif
} __packed;
-static inline uint8_t *
+static __inline uint8_t *
ar_sha(struct arphdr *ap)
{
return ((uint8_t *)(ap + 1)) + 0;
}
-static inline uint8_t *
+static __inline uint8_t *
ar_spa(struct arphdr *ap)
{
return ((uint8_t *)(ap + 1)) + ap->ar_hln;
}
-static inline uint8_t *
+static __inline uint8_t *
ar_tha(struct arphdr *ap)
{
if (ntohs(ap->ar_hrd) == ARPHRD_IEEE1394) {
@@ -95,7 +95,7 @@
}
}
-static inline uint8_t *
+static __inline uint8_t *
ar_tpa(struct arphdr *ap)
{
if (ntohs(ap->ar_hrd) == ARPHRD_IEEE1394) {
diff -r f393ff024f6d -r aa402f2c98da sys/net/if_ether.h
--- a/sys/net/if_ether.h Thu Apr 19 21:19:07 2018 +0000
+++ b/sys/net/if_ether.h Thu Apr 19 21:20:43 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ether.h,v 1.71 2018/01/15 16:36:51 maxv Exp $ */
+/* $NetBSD: if_ether.h,v 1.72 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -298,7 +298,7 @@
*/
/* add VLAN tag to input/received packet */
-static inline void
+static __inline void
vlan_set_tag(struct mbuf *m, uint16_t vlantag)
{
/* VLAN tag contains priority, CFI and VLAN ID */
@@ -308,14 +308,14 @@
return;
}
-static inline bool
+static __inline bool
vlan_has_tag(struct mbuf *m)
{
return (m->m_flags & M_VLANTAG) != 0;
}
/* extract VLAN ID value from a VLAN tag */
-static inline uint16_t
+static __inline uint16_t
vlan_get_tag(struct mbuf *m)
{
KASSERT((m->m_flags & M_PKTHDR) != 0);
diff -r f393ff024f6d -r aa402f2c98da sys/net/if_gif.h
--- a/sys/net/if_gif.h Thu Apr 19 21:19:07 2018 +0000
+++ b/sys/net/if_gif.h Thu Apr 19 21:20:43 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.h,v 1.29 2017/11/27 05:03:11 knakahara Exp $ */
+/* $NetBSD: if_gif.h,v 1.30 2018/04/19 21:20:43 christos Exp $ */
/* $KAME: if_gif.h,v 1.23 2001/07/27 09:21:42 itojun Exp $ */
/*
@@ -95,7 +95,7 @@
* Once a reader dereference sc->sc_var by this API, the reader must not
* re-dereference form sc->sc_var.
*/
-static inline struct gif_variant *
+static __inline struct gif_variant *
gif_getref_variant(struct gif_softc *sc, struct psref *psref)
{
struct gif_variant *var;
@@ -111,7 +111,7 @@
return var;
}
-static inline void
+static __inline void
gif_putref_variant(struct gif_variant *var, struct psref *psref)
{
@@ -119,7 +119,7 @@
psref_release(psref, &var->gv_psref, gv_psref_class);
}
-static inline bool
+static __inline bool
gif_heldref_variant(struct gif_variant *var)
{
diff -r f393ff024f6d -r aa402f2c98da sys/net/if_ipsec.h
--- a/sys/net/if_ipsec.h Thu Apr 19 21:19:07 2018 +0000
+++ b/sys/net/if_ipsec.h Thu Apr 19 21:20:43 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.h,v 1.1 2018/01/10 10:56:30 knakahara Exp $ */
+/* $NetBSD: if_ipsec.h,v 1.2 2018/04/19 21:20:43 christos Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -111,21 +111,21 @@
#define IV_SP_OUT(x) ((x)->iv_sp[IPSEC_DIR_OUTBOUND])
#define IV_SP_OUT6(x) ((x)->iv_sp6[IPSEC_DIR_OUTBOUND])
-static inline bool
+static __inline bool
if_ipsec_variant_is_configured(struct ipsec_variant *var)
{
Home |
Main Index |
Thread Index |
Old Index