* [PATCH mptcp-net 1/2] selftests: mptcp: connect: fix C23 extension warning
2025-08-03 12:13 [PATCH mptcp-net 0/2] selftests: mptcp: connect: fix C23 extension warning Matthieu Baerts (NGI0)
@ 2025-08-03 12:13 ` Matthieu Baerts (NGI0)
2025-08-03 12:13 ` [PATCH mptcp-net 2/2] selftests: mptcp: sockopt: " Matthieu Baerts (NGI0)
2025-08-03 14:08 ` [PATCH mptcp-net 0/2] selftests: mptcp: connect: " Geliang Tang
2 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts (NGI0) @ 2025-08-03 12:13 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts (NGI0)
GCC was complaining about the new label:
mptcp_connect.c:187:2: warning: label followed by a declaration is a C23 extension [-Wc23-extensions]
187 | int err = getaddrinfo(node, service, hints, res);
| ^
Simply declare 'err' before the label to avoid this warning.
Fixes: a862771d1aa4 ("selftests: mptcp: use IPPROTO_MPTCP for getaddrinfo")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_connect.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index ac1349c4b9e5404c95935eb38b08a15d774eb1d9..4f07ac9fa207cb08a934582b98d688d0b9512f97 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -183,9 +183,10 @@ static void xgetaddrinfo(const char *node, const char *service,
struct addrinfo *hints,
struct addrinfo **res)
{
-again:
- int err = getaddrinfo(node, service, hints, res);
+ int err;
+again:
+ err = getaddrinfo(node, service, hints, res);
if (err) {
const char *errstr;
--
2.50.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH mptcp-net 2/2] selftests: mptcp: sockopt: fix C23 extension warning
2025-08-03 12:13 [PATCH mptcp-net 0/2] selftests: mptcp: connect: fix C23 extension warning Matthieu Baerts (NGI0)
2025-08-03 12:13 ` [PATCH mptcp-net 1/2] " Matthieu Baerts (NGI0)
@ 2025-08-03 12:13 ` Matthieu Baerts (NGI0)
2025-08-03 14:08 ` [PATCH mptcp-net 0/2] selftests: mptcp: connect: " Geliang Tang
2 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts (NGI0) @ 2025-08-03 12:13 UTC (permalink / raw)
To: mptcp; +Cc: Matthieu Baerts (NGI0)
GCC was complaining about the new label:
mptcp_inq.c:79:2: warning: label followed by a declaration is a C23 extension [-Wc23-extensions]
79 | int err = getaddrinfo(node, service, hints, res);
| ^
mptcp_sockopt.c:166:2: warning: label followed by a declaration is a C23 extension [-Wc23-extensions]
166 | int err = getaddrinfo(node, service, hints, res);
| ^
Simply declare 'err' before the label to avoid this warning.
Fixes: dd367e81b79a ("selftests: mptcp: sockopt: use IPPROTO_MPTCP for getaddrinfo")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
tools/testing/selftests/net/mptcp/mptcp_inq.c | 5 +++--
tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_inq.c b/tools/testing/selftests/net/mptcp/mptcp_inq.c
index 3cf1e2a612cef911028f46569563d16dd5d32129..f3bcaa48df8f22e8f4833fcc3b919d21764bf7fb 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_inq.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_inq.c
@@ -75,9 +75,10 @@ static void xgetaddrinfo(const char *node, const char *service,
struct addrinfo *hints,
struct addrinfo **res)
{
-again:
- int err = getaddrinfo(node, service, hints, res);
+ int err;
+again:
+ err = getaddrinfo(node, service, hints, res);
if (err) {
const char *errstr;
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
index 9934a68df23708ecb413c4ab26523989e3b9f158..e934dd26a59d9b50445d61e8b8013ce3c8d2a8a0 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c
@@ -162,9 +162,10 @@ static void xgetaddrinfo(const char *node, const char *service,
struct addrinfo *hints,
struct addrinfo **res)
{
-again:
- int err = getaddrinfo(node, service, hints, res);
+ int err;
+again:
+ err = getaddrinfo(node, service, hints, res);
if (err) {
const char *errstr;
--
2.50.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH mptcp-net 0/2] selftests: mptcp: connect: fix C23 extension warning
2025-08-03 12:13 [PATCH mptcp-net 0/2] selftests: mptcp: connect: fix C23 extension warning Matthieu Baerts (NGI0)
2025-08-03 12:13 ` [PATCH mptcp-net 1/2] " Matthieu Baerts (NGI0)
2025-08-03 12:13 ` [PATCH mptcp-net 2/2] selftests: mptcp: sockopt: " Matthieu Baerts (NGI0)
@ 2025-08-03 14:08 ` Geliang Tang
2025-08-04 8:32 ` Matthieu Baerts
2 siblings, 1 reply; 5+ messages in thread
From: Geliang Tang @ 2025-08-03 14:08 UTC (permalink / raw)
To: Matthieu Baerts (NGI0), mptcp
Hi Matt,
On Sun, 2025-08-03 at 14:13 +0200, Matthieu Baerts (NGI0) wrote:
> GCC was complaining about the new label:
>
> mptcp_connect.c:187:2: warning: label followed by a declaration is
> a C23 extension [-Wc23-extensions]
> 187 | int err = getaddrinfo(node, service, hints, res);
> | ^
>
> mptcp_inq.c:79:2: warning: label followed by a declaration is a C23
> extension [-Wc23-extensions]
> 79 | int err = getaddrinfo(node, service, hints, res);
> | ^
>
> mptcp_sockopt.c:166:2: warning: label followed by a declaration is
> a C23 extension [-Wc23-extensions]
> 166 | int err = getaddrinfo(node, service, hints, res);
> | ^
>
> Simply declare 'err' before the label to avoid this warning.
>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
LGTM!
Reviewed-by: Geliang Tang <geliang@kernel.org>
Thanks,
-Geliang
> ---
> Matthieu Baerts (NGI0) (2):
> selftests: mptcp: connect: fix C23 extension warning
> selftests: mptcp: sockopt: fix C23 extension warning
>
> tools/testing/selftests/net/mptcp/mptcp_connect.c | 5 +++--
> tools/testing/selftests/net/mptcp/mptcp_inq.c | 5 +++--
> tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 5 +++--
> 3 files changed, 9 insertions(+), 6 deletions(-)
> ---
> base-commit: 5c7ec796258e1599e2033ae0f40434b2ba6ca21c
> change-id: 20250803-sft-mptcp-warn-gcc-4808047d562e
>
> Best regards,
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH mptcp-net 0/2] selftests: mptcp: connect: fix C23 extension warning
2025-08-03 14:08 ` [PATCH mptcp-net 0/2] selftests: mptcp: connect: " Geliang Tang
@ 2025-08-04 8:32 ` Matthieu Baerts
0 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2025-08-04 8:32 UTC (permalink / raw)
To: Geliang Tang, mptcp
Hi Geliang,
On 03/08/2025 16:08, Geliang Tang wrote:
> Hi Matt,
>
> On Sun, 2025-08-03 at 14:13 +0200, Matthieu Baerts (NGI0) wrote:
>> GCC was complaining about the new label:
>>
>> mptcp_connect.c:187:2: warning: label followed by a declaration is
>> a C23 extension [-Wc23-extensions]
>> 187 | int err = getaddrinfo(node, service, hints, res);
>> | ^
>>
>> mptcp_inq.c:79:2: warning: label followed by a declaration is a C23
>> extension [-Wc23-extensions]
>> 79 | int err = getaddrinfo(node, service, hints, res);
>> | ^
>>
>> mptcp_sockopt.c:166:2: warning: label followed by a declaration is
>> a C23 extension [-Wc23-extensions]
>> 166 | int err = getaddrinfo(node, service, hints, res);
>> | ^
>>
>> Simply declare 'err' before the label to avoid this warning.
>>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>
> LGTM!
>
> Reviewed-by: Geliang Tang <geliang@kernel.org>
Thank you for the review!
Now in our tree:
New patches for t/upstream-net and t/upstream:
- 9486cb4888a5: selftests: mptcp: connect: fix C23 extension warning
- 6a17fdde8884: selftests: mptcp: sockopt: fix C23 extension warning
- Results: 9380c91e86eb..82cf743daa3e (export-net)
- Results: c6e4c6478b19..58528cde3023 (export)
Tests are now in progress:
- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/3ce0a4201191ee78fa4fbc3bcbe199f4409aa9ce/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/673139156ef681c8c71abad4cd97db0ee2f7f6d0/checks
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
^ permalink raw reply [flat|nested] 5+ messages in thread