Module Name: src
Committed By: christos
Date: Thu Apr 19 21:21:44 UTC 2018
Modified Files:
src/sys/netinet: in.h in_var.h tcp_vtw.h
Log Message:
s/static inline/static __inline/g for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/netinet/in.h
cvs rdiff -u -r1.95 -r1.96 src/sys/netinet/in_var.h
cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/tcp_vtw.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/in.h
diff -u src/sys/netinet/in.h:1.104 src/sys/netinet/in.h:1.105
--- src/sys/netinet/in.h:1.104 Fri Feb 9 13:31:52 2018
+++ src/sys/netinet/in.h Thu Apr 19 17:21:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in.h,v 1.104 2018/02/09 18:31:52 maxv Exp $ */
+/* $NetBSD: in.h,v 1.105 2018/04/19 21:21:44 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -601,7 +601,7 @@ int sockaddr_in_cmp(const struct sockadd
const void *sockaddr_in_const_addr(const struct sockaddr *, socklen_t *);
void *sockaddr_in_addr(struct sockaddr *, socklen_t *);
-static inline void
+static __inline void
sockaddr_in_init1(struct sockaddr_in *sin, const struct in_addr *addr,
in_port_t port)
{
@@ -610,7 +610,7 @@ sockaddr_in_init1(struct sockaddr_in *si
memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
}
-static inline void
+static __inline void
sockaddr_in_init(struct sockaddr_in *sin, const struct in_addr *addr,
in_port_t port)
{
@@ -619,7 +619,7 @@ sockaddr_in_init(struct sockaddr_in *sin
sockaddr_in_init1(sin, addr, port);
}
-static inline struct sockaddr *
+static __inline struct sockaddr *
sockaddr_in_alloc(const struct in_addr *addr, in_port_t port, int flags)
{
struct sockaddr *sa;
Index: src/sys/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.95 src/sys/netinet/in_var.h:1.96
--- src/sys/netinet/in_var.h:1.95 Fri May 12 13:53:54 2017
+++ src/sys/netinet/in_var.h Thu Apr 19 17:21:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.95 2017/05/12 17:53:54 ryo Exp $ */
+/* $NetBSD: in_var.h,v 1.96 2018/04/19 21:21:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@ struct in_ifaddr {
};
#ifdef _KERNEL
-static inline void
+static __inline void
ia4_acquire(struct in_ifaddr *ia, struct psref *psref)
{
@@ -124,7 +124,7 @@ ia4_acquire(struct in_ifaddr *ia, struct
ifa_acquire(&ia->ia_ifa, psref);
}
-static inline void
+static __inline void
ia4_release(struct in_ifaddr *ia, struct psref *psref)
{
@@ -249,7 +249,7 @@ extern const int inetctlerrmap[];
* Find whether an internet address (in_addr) belongs to one
* of our interfaces (in_ifaddr). NULL if the address isn't ours.
*/
-static inline struct in_ifaddr *
+static __inline struct in_ifaddr *
in_get_ia(struct in_addr addr)
{
struct in_ifaddr *ia;
@@ -262,7 +262,7 @@ in_get_ia(struct in_addr addr)
return ia;
}
-static inline struct in_ifaddr *
+static __inline struct in_ifaddr *
in_get_ia_psref(struct in_addr addr, struct psref *psref)
{
struct in_ifaddr *ia;
@@ -281,7 +281,7 @@ in_get_ia_psref(struct in_addr addr, str
* Find whether an internet address (in_addr) belongs to a specified
* interface. NULL if the address isn't ours.
*/
-static inline struct in_ifaddr *
+static __inline struct in_ifaddr *
in_get_ia_on_iface(struct in_addr addr, struct ifnet *ifp)
{
struct in_ifaddr *ia;
@@ -295,7 +295,7 @@ in_get_ia_on_iface(struct in_addr addr,
return ia;
}
-static inline struct in_ifaddr *
+static __inline struct in_ifaddr *
in_get_ia_on_iface_psref(struct in_addr addr, struct ifnet *ifp, struct psref *psref)
{
struct in_ifaddr *ia;
@@ -314,7 +314,7 @@ in_get_ia_on_iface_psref(struct in_addr
* Find an internet address structure (in_ifaddr) corresponding
* to a given interface (ifnet structure).
*/
-static inline struct in_ifaddr *
+static __inline struct in_ifaddr *
in_get_ia_from_ifp(struct ifnet *ifp)
{
struct ifaddr *ifa;
@@ -327,7 +327,7 @@ in_get_ia_from_ifp(struct ifnet *ifp)
return ifatoia(ifa);
}
-static inline struct in_ifaddr *
+static __inline struct in_ifaddr *
in_get_ia_from_ifp_psref(struct ifnet *ifp, struct psref *psref)
{
struct in_ifaddr *ia;
Index: src/sys/netinet/tcp_vtw.h
diff -u src/sys/netinet/tcp_vtw.h:1.8 src/sys/netinet/tcp_vtw.h:1.9
--- src/sys/netinet/tcp_vtw.h:1.8 Tue Dec 13 03:29:03 2016
+++ src/sys/netinet/tcp_vtw.h Thu Apr 19 17:21:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_vtw.h,v 1.8 2016/12/13 08:29:03 ozaki-r Exp $ */
+/* $NetBSD: tcp_vtw.h,v 1.9 2018/04/19 21:21:44 christos Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -174,13 +174,13 @@ struct fatp_mi {
fatp_word_t tag[FATP_NTAGS]; /* 15 tags per CL */
};
-static inline int
+static __inline int
fatp_ntags(void)
{
return FATP_NTAGS;
}
-static inline int
+static __inline int
fatp_full(fatp_t *fp)
{
fatp_t full;
@@ -297,7 +297,7 @@ typedef struct vtw_stats vtw_stats_t;
/*!\brief follow fatp next 'pointer'
*/
-static inline fatp_t *
+static __inline fatp_t *
fatp_next(fatp_ctl_t *fat, fatp_t *fp)
{
return fp->nxt ? fat->base + fp->nxt-1 : 0;
@@ -305,21 +305,21 @@ fatp_next(fatp_ctl_t *fat, fatp_t *fp)
/*!\brief determine a collection-relative fat pointer index.
*/
-static inline uint32_t
+static __inline uint32_t
fatp_index(fatp_ctl_t *fat, fatp_t *fp)
{
return fp ? 1 + (fp - fat->base) : 0;
}
-static inline uint32_t
+static __inline uint32_t
v4_tag(uint32_t faddr, uint32_t fport, uint32_t laddr, uint32_t lport)
{
return (ntohl(faddr) + ntohs(fport)
+ ntohl(laddr) + ntohs(lport));
}
-static inline uint32_t
+static __inline uint32_t
v6_tag(const struct in6_addr *faddr, uint16_t fport,
const struct in6_addr *laddr, uint16_t lport)
{
@@ -330,7 +330,7 @@ v6_tag(const struct in6_addr *faddr, uin
#endif
}
-static inline uint32_t
+static __inline uint32_t
v4_port_tag(uint16_t lport)
{
uint32_t tag = lport ^ (lport << 11);
@@ -345,7 +345,7 @@ v4_port_tag(uint16_t lport)
return tag;
}
-static inline uint32_t
+static __inline uint32_t
v6_port_tag(uint16_t lport)
{
return v4_port_tag(lport);
