tools/testing/selftests/net/af_unix/msg_oob.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Add proper type cast (char *) to the buffer being passed to TH_LOG
macro in __recvpair function.
This change fixes the below warnings during test compilation:
```
In file included from msg_oob.c:14:
msg_oob.c: In function ‘__recvpair’:
../../kselftest_harness.h:106:40: warning: format ‘%s’ expects argument
of type ‘char *’,but argument 6 has type ‘const void *’ [-Wformat=]
../../kselftest_harness.h:101:17: note: in expansion of macro ‘__TH_LOG’
msg_oob.c:235:17: note: in expansion of macro ‘TH_LOG’
../../kselftest_harness.h:106:40: warning: format ‘%s’ expects argument
of type ‘char *’,but argument 6 has type ‘const void *’ [-Wformat=]
../../kselftest_harness.h:101:17: note: in expansion of macro ‘__TH_LOG’
msg_oob.c:259:25: note: in expansion of macro ‘TH_LOG’
```
Signed-off-by: Abhinav Jain <jain.abhinav177@gmail.com>
---
tools/testing/selftests/net/af_unix/msg_oob.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/af_unix/msg_oob.c b/tools/testing/selftests/net/af_unix/msg_oob.c
index 16d0c172eaeb..66d76ab38251 100644
--- a/tools/testing/selftests/net/af_unix/msg_oob.c
+++ b/tools/testing/selftests/net/af_unix/msg_oob.c
@@ -232,7 +232,8 @@ static void __recvpair(struct __test_metadata *_metadata,
if (ret[0] != expected_len || recv_errno[0] != expected_errno) {
TH_LOG("AF_UNIX :%s", ret[0] < 0 ? strerror(recv_errno[0]) : recv_buf[0]);
- TH_LOG("Expected:%s", expected_errno ? strerror(expected_errno) : expected_buf);
+ TH_LOG("Expected:%s",
+ expected_errno ? strerror(expected_errno) : (char *)expected_buf);
ASSERT_EQ(ret[0], expected_len);
ASSERT_EQ(recv_errno[0], expected_errno);
@@ -256,7 +257,8 @@ static void __recvpair(struct __test_metadata *_metadata,
cmp = strncmp(expected_buf, recv_buf[0], expected_len);
if (cmp) {
TH_LOG("AF_UNIX :%s", ret[0] < 0 ? strerror(recv_errno[0]) : recv_buf[0]);
- TH_LOG("Expected:%s", expected_errno ? strerror(expected_errno) : expected_buf);
+ TH_LOG("Expected:%s", expected_errno ? strerror(expected_errno)
+ : (char *)expected_buf);
ASSERT_EQ(cmp, 0);
}
--
2.34.1
From: Abhinav Jain <jain.abhinav177@gmail.com>
Date: Sat, 10 Aug 2024 19:10:37 +0530
> Add proper type cast (char *) to the buffer being passed to TH_LOG
> macro in __recvpair function.
>
> This change fixes the below warnings during test compilation:
>
> ```
> In file included from msg_oob.c:14:
> msg_oob.c: In function ‘__recvpair’:
>
> ../../kselftest_harness.h:106:40: warning: format ‘%s’ expects argument
> of type ‘char *’,but argument 6 has type ‘const void *’ [-Wformat=]
>
> ../../kselftest_harness.h:101:17: note: in expansion of macro ‘__TH_LOG’
> msg_oob.c:235:17: note: in expansion of macro ‘TH_LOG’
>
> ../../kselftest_harness.h:106:40: warning: format ‘%s’ expects argument
> of type ‘char *’,but argument 6 has type ‘const void *’ [-Wformat=]
>
> ../../kselftest_harness.h:101:17: note: in expansion of macro ‘__TH_LOG’
> msg_oob.c:259:25: note: in expansion of macro ‘TH_LOG’
> ```
>
Fixes: tag is needed here (no space between SOB tag)
> Signed-off-by: Abhinav Jain <jain.abhinav177@gmail.com>
> ---
> tools/testing/selftests/net/af_unix/msg_oob.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/net/af_unix/msg_oob.c b/tools/testing/selftests/net/af_unix/msg_oob.c
> index 16d0c172eaeb..66d76ab38251 100644
> --- a/tools/testing/selftests/net/af_unix/msg_oob.c
> +++ b/tools/testing/selftests/net/af_unix/msg_oob.c
> @@ -232,7 +232,8 @@ static void __recvpair(struct __test_metadata *_metadata,
>
> if (ret[0] != expected_len || recv_errno[0] != expected_errno) {
> TH_LOG("AF_UNIX :%s", ret[0] < 0 ? strerror(recv_errno[0]) : recv_buf[0]);
> - TH_LOG("Expected:%s", expected_errno ? strerror(expected_errno) : expected_buf);
> + TH_LOG("Expected:%s",
> + expected_errno ? strerror(expected_errno) : (char *)expected_buf);
>
> ASSERT_EQ(ret[0], expected_len);
> ASSERT_EQ(recv_errno[0], expected_errno);
I don't remember why I defined expected_buf as (void *), but more simple
fix would be the following ?
---8<---
diff --git a/tools/testing/selftests/net/af_unix/msg_oob.c b/tools/testing/selftests/net/af_unix/msg_oob.c
index 16d0c172eaeb..535eb2c3d7d1 100644
--- a/tools/testing/selftests/net/af_unix/msg_oob.c
+++ b/tools/testing/selftests/net/af_unix/msg_oob.c
@@ -209,7 +209,7 @@ static void __sendpair(struct __test_metadata *_metadata,
static void __recvpair(struct __test_metadata *_metadata,
FIXTURE_DATA(msg_oob) *self,
- const void *expected_buf, int expected_len,
+ const char *expected_buf, int expected_len,
int buf_len, int flags)
{
int i, ret[2], recv_errno[2], expected_errno = 0;
---8<---
Thanks!
On Mon, 12 Aug 2024 11:39:44 -0700, Kuniyuki Iwashima wrote:
> Fixes: tag is needed here (no space between SOB tag)
Thank you, I have added it in v2 here:
> I don't remember why I defined expected_buf as (void *), but more simple
> fix would be the following ?
>
> ---8<---
> diff --git a/tools/testing/selftests/net/af_unix/msg_oob.c b/tools/testing/selftests/net/af_unix/msg_oob.c
> index 16d0c172eaeb..535eb2c3d7d1 100644
> --- a/tools/testing/selftests/net/af_unix/msg_oob.c
> +++ b/tools/testing/selftests/net/af_unix/msg_oob.c
> @@ -209,7 +209,7 @@ static void __sendpair(struct __test_metadata *_metadata,
>
> static void __recvpair(struct __test_metadata *_metadata,
> FIXTURE_DATA(msg_oob) *self,
> - const void *expected_buf, int expected_len,
> + const char *expected_buf, int expected_len,
> int buf_len, int flags)
> {
> int i, ret[2], recv_errno[2], expected_errno = 0;
> ---8<---
Yes, I completely missed that. I have sent a v2, please review:
lore.kernel.org/all/20240812191122.1092806-1-jain.abhinav177@gmail.com
© 2016 - 2026 Red Hat, Inc.