[Openvpn-devel,v11] vlan: Remove -Wconversion override

Message ID 20251008105507.9997-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v11] vlan: Remove -Wconversion override | expand

Commit Message

Gert Doering Oct. 8, 2025, 10:55 a.m. UTC
From: Frank Lichtenheld <frank@lichtenheld.com>

Only Debian 11 (GCC 10) complains about this.
We decided not to add work-arounds for GCC 10
and older and instead accept that they do not
build -Werror clean.

Change-Id: I73c46ac630834a8cf8894aaa2dcc429fbedd3db7
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1179
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1179
This mail reflects revision 11 of this Change.

Acked-by according to Gerrit (reflected above):

Comments

Gert Doering Oct. 8, 2025, 11:27 a.m. UTC | #1
v11 is much more to my liking that 1..9 ;-)

Your patch has been applied to the master branch.

(And uuuh, mail-archive.org list returned to functional, yay ;-) ).

commit 5a042b0702c98d5e32889bec2a9b22d2ac3d79bd
Author: Frank Lichtenheld
Date:   Wed Oct 8 12:55:01 2025 +0200

     vlan: Remove -Wconversion override

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1179
     Message-Id: <20251008105507.9997-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33285.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/vlan.c b/src/openvpn/vlan.c
index 3da470a..a6a6e93 100644
--- a/src/openvpn/vlan.c
+++ b/src/openvpn/vlan.c
@@ -43,11 +43,6 @@ 
     return ntohs(hdr->pcp_cfi_vid & OPENVPN_8021Q_MASK_VID);
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
 /*
  * Set the VLAN Identifier (VID) in an IEEE 802.1Q header.
  *
@@ -61,10 +56,6 @@ 
         (hdr->pcp_cfi_vid & ~OPENVPN_8021Q_MASK_VID) | (htons(vid) & OPENVPN_8021Q_MASK_VID);
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 /*
  * vlan_decapsulate - remove 802.1q header and return VID
  *