From: "cron2 (Code Review)" Date: Sun, 12 Apr 2026 15:12:19 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., antonio@...2726... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="KE0PQLz3oBY="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: networking_sitnl: Make sitnl_parse_rtattr* return void List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --KE0PQLz3oBY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16= 14?usp=3Demail ) Change subject: networking_sitnl: Make sitnl_parse_rtattr* return void ...................................................................... networking_sitnl: Make sitnl_parse_rtattr* return void 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 Message-Id: <20260408204213.9892-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 559.html Signed-off-by: Gert Doering --- M src/openvpn/networking_sitnl.c 1 file changed, 5 insertions(+), 16 deletions(-) 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 *r= ta, size_t len, unsigned short flags) { @@ -1375,14 +1375,12 @@ { msg(D_ROUTE, "%s: %zu bytes not parsed! (rta_len=3D%u)", __func__,= len, rta->rta_len); } - - return 0; } -static int +static void sitnl_parse_rtattr(struct rtattr *tb[], size_t max, struct rtattr *rta, si= ze_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 =3D arg; struct ifinfomsg *ifi =3D NLMSG_DATA(n); struct rtattr *tb[IFLA_MAX + 1]; - int ret; - ret =3D 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 =3D 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]) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1614?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Idfe2afd9616e17f0f80a914ff054ae18f0b6972b Gerrit-Change-Number: 1614 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld Gerrit-Reviewer: ordex Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --KE0PQLz3oBY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

networking_sitnl: Make sitnl_parse_rtattr* retur=
n void

It returned a constant value so it didn't actually
do = anything.

Identified by cppcheck.

Change-Id: Idfe2afd9616e17f= 0f80a914ff054ae18f0b6972b
Signed-off-by: Frank Lichtenheld <frank@...493...= 2641...>
Acked-by: Antonio Quartulli <antonio@...2726...>
Ge= rrit URL: https://gerrit.openvpn.net/c/openvpn/+/1614
Message-Id: <20= 260408204213.9892-1-gert@...1296...>
URL: https://www.mail-archive.co= m/openvpn-devel@lists.sourceforge.net/msg36559.html
Signed-off-by: Gert = Doering <gert@...1296...>
---
M src/openvpn/networking_sitnl.c<= br>1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sit=
nl.c
index baf6f89..b3f8e2b 100644
--- a/sr= c/openvpn/networking_sitnl.c
+++ b/src/openvpn/networking_s= itnl.c
@@ -1351,7 +1351,7 @@
return re= t;
}

-static int
+static void
sitnl_parse_rtattr_flags(struct rtatt= r *tb[], size_t max, struct rtattr *rta, size_t len,
= unsigned short flags)
{
@@ -1375,14 +1375,12 @@
{
m= sg(D_ROUTE, "%s: %zu bytes not parsed! (rta_len=3D%u)", __func__,= len, rta->rta_len);
}
-
- return 0;
}

-static int
+static void
sitnl_parse_rtattr(str= uct 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);<= /span>
}

#define sitnl_parse_r= tattr_nested(tb, max, rta) \
@@ -1394,23 +1392,14 @@=
char *type =3D arg;
struct ifinfomsg *i= fi =3D NLMSG_DATA(n);
struct rtattr *tb[IFLA_MAX + 1];=
- int ret;
- ret =3D = sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(n));- if (ret < 0)
<= span style=3D"color: hsl(0, 100%, 40%);">- {

- return ret;
- }
+ sitnl_parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), IFLA_PAYLOAD(= n));

if (tb[IFLA_LINKINFO]) {
struct rtattr *tb_link[IFLA_INFO_MA= X + 1];

- ret =3D sitnl_parse_rtattr_nested(tb_link, IFLA_INFO_MAX, tb[IF= LA_LINKINFO]);
- = if (ret < 0)
- = {
- retur= n ret;
- }
+ sitnl_parse_rtatt= r_nested(tb_link, IFLA_INFO_MAX, tb[IFLA_LINKINFO]);

if (!tb_link[IFLA_INFO_KIND])
= {

To view, visit change 1614. To unsubscri= be, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Idfe2afd9616e17f0f80a914ff05= 4ae18f0b6972b
Gerrit-Change-Number: 1614
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: ordex <antonio@...2726...&= gt;
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --KE0PQLz3oBY=--