From patchwork Sun Jan 16 22:35:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2230 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.7]) by backend41.mail.ord1d.rsapps.net with LMTP id 2DTlCJk45WHgcgAAqwncew (envelope-from ) for ; Mon, 17 Jan 2022 04:36:25 -0500 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.7]) by director10.mail.ord1d.rsapps.net with LMTP id wDsFDpk45WFzGwAApN4f7A (envelope-from ) for ; Mon, 17 Jan 2022 04:36:25 -0500 Received: from smtp12.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTPS id KIPMBZk45WH4fAAA8TVjwQ (envelope-from ) for ; Mon, 17 Jan 2022 04:36:25 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp12.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: ef878de0-7778-11ec-9f0d-525400068c1c-1-1 Received: from [216.105.38.7] ([216.105.38.7:48036] helo=lists.sourceforge.net) by smtp12.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A7/4D-13361-89835E16; Mon, 17 Jan 2022 04:36:24 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1n9OQ3-0008TL-8P; Mon, 17 Jan 2022 09:35:18 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n9OQ1-0008TF-Jt for openvpn-devel@lists.sourceforge.net; Mon, 17 Jan 2022 09:35:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TkydXfXKA0SkcE5srCfiAwMs6h1v1WaCLhczqEaEcAg=; b=TEkjVvT57tWFeQi/QkR6CHRuKA lrMFT2THMdOoMWXQAqQQOrcPGDD0257B4SiqRWWES2nan34Yi3weXo6GJByub48haHj7OWxux0He4 kRriD8I5+bA2C4TyRPfbUAMYNv+6DOHwHj5nugdGjifkyISgLljNX3o6HOAOm7OPegss=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=TkydXfXKA0SkcE5srCfiAwMs6h1v1WaCLhczqEaEcAg=; b=D pzeWYhpMtWKnt9fHfGya8pdNC0xcEecmGwSHn6K/OO5mtCyYFGRMkRNKw99nTNJ6v1kTbKWhkf6hx NGDKxHzuASlzqKtvQTr6VZ2cta+OLecyugVVI0RxCWRa7wA79t/cXJfkWTgp4ycqLL5oRtqMcpPUj TRBBeBdW4hQY8aN4=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1n9OPw-000dVo-GK for openvpn-devel@lists.sourceforge.net; Mon, 17 Jan 2022 09:35:16 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Mon, 17 Jan 2022 10:35:08 +0100 Message-Id: <20220117093508.17681-1-a@unstable.cc> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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. Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1n9OPw-000dVo-GK Subject: [Openvpn-devel] [PATCH] use 'static inline' instead of 'inline static' X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov , Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox 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 --- 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 8017130f..d2dbb64b 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 94010a98..0062951d 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;