From 943fb256ded24e8637a2bbaabd525e4b85ecc810 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Mon, 17 Jan 2022 10:35:08 +0100 Subject: [PATCH] use 'static inline' instead of 'inline static' There are 2 occurrences where the order 'inline static' is used when defining a function, while the rest of the code uses the definitely more common form 'static inline'. Convert those 2 occurrences to the common format. Reported-by: Lev Stipakov Signed-off-by: Antonio Quartulli Acked-by: Lev Stipakov Message-Id: <20220117093508.17681-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23554.html Signed-off-by: Gert Doering --- src/openvpn/buffer.h | 2 +- src/openvpn/proto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/buffer.h b/src/openvpn/buffer.h index 8017130f6..d2dbb64b9 100644 --- a/src/openvpn/buffer.h +++ b/src/openvpn/buffer.h @@ -198,7 +198,7 @@ bool buf_init_debug(struct buffer *buf, int offset, const char *file, int line); /* inline functions */ -inline static void +static inline void gc_freeaddrinfo_callback(void *addr) { freeaddrinfo((struct addrinfo *) addr); diff --git a/src/openvpn/proto.h b/src/openvpn/proto.h index 94010a98f..0062951d5 100644 --- a/src/openvpn/proto.h +++ b/src/openvpn/proto.h @@ -251,7 +251,7 @@ struct ip_tcp_udp_hdr { * This returns an ip protocol version of packet inside tun * and offset of IP header (via parameter). */ -inline static int +static inline int get_tun_ip_ver(int tunnel_type, struct buffer *buf, int *ip_hdr_offset) { int ip_ver = -1; -- 2.47.2