diff mbox series

[Openvpn-devel,v1] Remove various unused structs

Message ID 20260404203615.30863-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] Remove various unused structs | expand

Commit Message

Gert Doering April 4, 2026, 8:36 p.m. UTC 
From: Frank Lichtenheld <frank@lichtenheld.com>

Change-Id: I46499ff1f40dbdb94b84d58d17457d0ccdd75288
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1607
---

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/+/1607
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering April 5, 2026, 10:23 a.m. UTC | #1 
Easy to test for - "compile this on all relevant platforms and see if
something *does* needs the structures".  BB nicely did that for me :-) -
so I just stared a bit at the diff and wondered.

I see no real convincing need for this to go to release/2.7, so applied
to master only.  If we want release/2.7 to be cppcheck clean, we could
debate backporting these (but we didn't want to go there with the 
integer related cleanups either).

Your patch has been applied to the master branch.

commit b6cea99f4a36d170b2c11c89ba95b4dce255b3ee
Author: Frank Lichtenheld
Date:   Sat Apr 4 22:36:09 2026 +0200

     Remove various unused structs

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


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index b7bef46..2eab7b7 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -37,14 +37,6 @@ 
 #include <sys/inotify.h>
 #endif
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 struct multi_instance *
 multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
 {
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index f484fe2..e6f4e9c 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -46,14 +46,6 @@ 
 #define MULTI_IO_FILE_CLOSE_WRITE ((void *)5)
 #define MULTI_IO_DCO              ((void *)6)
 
-struct ta_iow_flags
-{
-    unsigned int flags;
-    unsigned int ret;
-    unsigned int tun;
-    unsigned int sock;
-};
-
 #ifdef ENABLE_DEBUG
 static const char *
 pract(int action)
diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c
index b88f03c..baf6f89 100644
--- a/src/openvpn/networking_sitnl.c
+++ b/src/openvpn/networking_sitnl.c
@@ -124,15 +124,6 @@ 
 typedef int (*sitnl_parse_reply_cb)(struct nlmsghdr *msg, void *arg);
 
 /**
- * Object returned by route request operation
- */
-struct sitnl_route_data_cb
-{
-    unsigned int iface;
-    inet_address_t gw;
-};
-
-/**
  * Helper function used to easily add attributes to a rtnl message
  */
 static int
diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 1cfbf80..3b18f74 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -3257,12 +3257,6 @@ 
  * netlink(3), netlink(7), rtnetlink(7)
  * https://www.virtualbox.org/svn/vbox/trunk/src/VBox/NetworkServices/NAT/
  */
-struct rtreq
-{
-    struct nlmsghdr nh;
-    struct rtmsg rtm;
-    char attrbuf[512];
-};
 
 void
 get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, const struct in6_addr *dest,