From: Gert Doering Date: Wed, 8 Apr 2026 22:42:07 +0200 Message-ID: <20260408204213.9892-1-gert@...1296...> In-Reply-To: References: MIME-Version: 1.0 Subject: [Openvpn-devel] [PATCH v2] networking_sitnl: Make sitnl_parse_rtattr* return void List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net From: Frank Lichtenheld It returned a constant value so it didn't actually do anything. Identified by cppcheck. Change-Id: Idfe2afd9616e17f0f80a914ff054ae18f0b6972b Signed-off-by: Frank Lichtenheld Acked-by: Antonio Quartulli Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1614 --- 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/+/1614 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Antonio Quartulli diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c index baf6f89..b3f8e2b 100644 --- a/src/openvpn/networking_sitnl.c +++ b/src/openvpn/networking_sitnl.c @@ -1351,7 +1351,7 @@ return ret; } -static int +static void sitnl_parse_rtattr_flags(struct rtattr *tb[], size_t max, struct rtattr *rta, size_t len, unsigned short flags) { @@ -1375,14 +1375,12 @@ { msg(D_ROUTE, "%s: %zu bytes not parsed! (rta_len=%u)", __func__, len, rta->rta_len); } - - return 0; } -static int +static void sitnl_parse_rtattr(struct rtattr *tb[], size_t max, struct rtattr *rta, size_t len) { - return sitnl_parse_rtattr_flags(tb, max, rta, len, 0); + sitnl_parse_rtattr_flags(tb, max, rta, len, 0); } #define sitnl_parse_rtattr_nested(tb, max, rta) \ @@ -1394,23 +1392,14 @@ char *type = arg; struct ifinfomsg *ifi = NLMSG_DATA(n); struct rtattr *tb[IFLA_MAX + 1]; - int ret; - ret = sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n)); - if (ret < 0) - { - return ret; - } + sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n)); if (tb[IFLA_LINKINFO]) { struct rtattr *tb_link[IFLA_INFO_MAX + 1]; - ret = sitnl_parse_rtattr_nested(tb_link, IFLA_INFO_MAX, tb[IFLA_LINKINFO]); - if (ret < 0) - { - return ret; - } + sitnl_parse_rtattr_nested(tb_link, IFLA_INFO_MAX, tb[IFLA_LINKINFO]); if (!tb_link[IFLA_INFO_KIND]) {