From patchwork Sun Feb 13 15:10:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2284 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.54]) by backend41.mail.ord1d.rsapps.net with LMTP id sPR5LGy6CWLrZwAAqwncew (envelope-from ) for ; Sun, 13 Feb 2022 21:11:56 -0500 Received: from proxy19.mail.iad3a.rsapps.net ([172.27.255.54]) by director9.mail.ord1d.rsapps.net with LMTP id oG9nAW26CWKiMgAAalYnBA (envelope-from ) for ; Sun, 13 Feb 2022 21:11:57 -0500 Received: from smtp35.gate.iad3a ([172.27.255.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.iad3a.rsapps.net with LMTPS id EJI2Nmy6CWKUfAAAXy6Yeg (envelope-from ) for ; Sun, 13 Feb 2022 21:11:56 -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: smtp35.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=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 7b976652-8d3b-11ec-9bc5-52540083445f-1-1 Received: from [216.105.38.7] ([216.105.38.7:44564] helo=lists.sourceforge.net) by smtp35.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 27/9F-02491-C6AB9026; Sun, 13 Feb 2022 21:11:56 -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 1nJQpZ-0001IU-CN; Mon, 14 Feb 2022 02:11:08 +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 1nJQpX-0001IM-U8 for openvpn-devel@lists.sourceforge.net; Mon, 14 Feb 2022 02:11:06 +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:To:From:Sender:Reply-To:Cc: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=akPNlcp1ptNFN4pWSB99v0vRWU6pl7mOP02IB5f4i0I=; b=UKF32DJW3ao9ryk2Mt5bp9uOnH ZjLqRJ9IFE3LswTgePzNQwQTIwOdszNDHUXb3GqEJgIzQ1qSnMSf5mL7rEEf3z1sCb0maXmsxsxtO zgnxz/6P5ba60mVn2H+SyQO5qkMma6bC/7uzzdlvXZKdT4bpG26aG0EVVQrnaL9KA5bs=; 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:To:From: Sender:Reply-To:Cc: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=akPNlcp1ptNFN4pWSB99v0vRWU6pl7mOP02IB5f4i0I=; b=D qP/eQXu7dpNCI+azlpnAft5U4puzhZ6LiXnSUUIAxfp/RWTeKRYD4yS1wW68Waph5g5b1GmoLhxUe stKQ9iLqKExJpvIC12BokYgCxCTwcrjcvHWYzlpkvESYQRU8fiahCU0jHL3Z4epvF+VUkgo5W7n4H BpFQwiDzJ2HpPkps=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nJQpS-000wkW-Ax for openvpn-devel@lists.sourceforge.net; Mon, 14 Feb 2022 02:11:06 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1nJQpK-000LuT-6t for openvpn-devel@lists.sourceforge.net; Mon, 14 Feb 2022 03:10:54 +0100 Received: (nullmailer pid 3750117 invoked by uid 10006); Mon, 14 Feb 2022 02:10:54 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 14 Feb 2022 03:10:53 +0100 Message-Id: <20220214021054.3750071-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 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: Some functions are only used when management is used or enable-small is not used. Fix the ifdefs to correctly also include these helper functions the ifdefs to avoid compile errors when using -Werror [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1nJQpS-000wkW-Ax Subject: [Openvpn-devel] [PATCH 1/2] Fix 'defined but not used' warnings with enable-small/disable-management 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Some functions are only used when management is used or enable-small is not used. Fix the ifdefs to correctly also include these helper functions the ifdefs to avoid compile errors when using -Werror Acked-by: Gert Doering --- src/openvpn/multi.c | 11 +++++------ src/openvpn/options.c | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 6f7bb6f8..e7f2c697 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3653,6 +3653,11 @@ multi_close_instance_on_signal(struct multi_context *m, struct multi_instance *m multi_close_instance(m, mi, false); } +/* + * Management subsystem callbacks + */ +#ifdef ENABLE_MANAGEMENT + static void multi_signal_instance(struct multi_context *m, struct multi_instance *mi, const int sig) { @@ -3660,12 +3665,6 @@ multi_signal_instance(struct multi_context *m, struct multi_instance *mi, const multi_close_instance_on_signal(m, mi); } -/* - * Management subsystem callbacks - */ - -#ifdef ENABLE_MANAGEMENT - static void management_callback_status(void *arg, const int version, struct status_output *so) { diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 813d34c9..2538421b 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -910,6 +910,8 @@ struct pull_filter_list struct pull_filter *tail; }; +#ifndef ENABLE_SMALL + static const char * pull_filter_type_name(int type) { @@ -931,8 +933,6 @@ pull_filter_type_name(int type) } } -#ifndef ENABLE_SMALL - #define SHOW_PARM(name, value, format) msg(D_SHOW_PARMS, " " #name " = " format, (value)) #define SHOW_STR(var) SHOW_PARM(var, (o->var ? o->var : "[UNDEF]"), "'%s'") #define SHOW_STR_INLINE(var) SHOW_PARM(var, \ @@ -1268,6 +1268,7 @@ dhcp_option_address_parse(const char *name, const char *parm, in_addr_t *array, #endif /* if defined(_WIN32) || defined(TARGET_ANDROID) */ +#ifndef ENABLE_SMALL static const char * print_vlan_accept(enum vlan_acceptable_frames mode) { @@ -1285,8 +1286,6 @@ print_vlan_accept(enum vlan_acceptable_frames mode) return NULL; } -#ifndef ENABLE_SMALL - static void show_p2mp_parms(const struct options *o) {