2023-11-06 17:26:36

by Richard Fitzgerald

[permalink] [raw]

Subject: [PATCH v2] kunit: test: Avoid cast warning when adding kfree() as an action

---

In kunit_log_test() pass the kfree_wrapper() function to kunit_add_action()
instead of directly passing kfree().

This prevents a cast warning:

lib/kunit/kunit-test.c:565:25: warning: cast from 'void (*)(const void *)'
to 'kunit_action_t *' (aka 'void (*)(void *)') converts to incompatible
function type [-Wcast-function-type-strict]

564 full_log = string_stream_get_string(test->log);
> 565 kunit_add_action(test, (kunit_action_t *)kfree, full_log);

Signed-off-by: Richard Fitzgerald <[email protected]>
Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Fixes: 05e2006ce493 ("kunit: Use string_stream for test log")
---
lib/kunit/kunit-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c
index 99d2a3a528e1..de2113a58fa0 100644
--- a/lib/kunit/kunit-test.c
+++ b/lib/kunit/kunit-test.c
@@ -562,7 +562,7 @@ static void kunit_log_test(struct kunit *test)
KUNIT_EXPECT_TRUE(test, test->log->append_newlines);

full_log = string_stream_get_string(test->log);
- kunit_add_action(test, (kunit_action_t *)kfree, full_log);
+ kunit_add_action(test, kfree_wrapper, full_log);
KUNIT_EXPECT_NOT_ERR_OR_NULL(test,
strstr(full_log, "put this in log."));
KUNIT_EXPECT_NOT_ERR_OR_NULL(test,
--
2.30.2

2023-11-06 18:08:40

by David Gow

[permalink] [raw]

Subject: Re: [PATCH v2] kunit: test: Avoid cast warning when adding kfree() as an action

---

On Mon, 6 Nov 2023 at 09:26, Richard Fitzgerald
<[email protected]> wrote:
>
> In kunit_log_test() pass the kfree_wrapper() function to kunit_add_action()
> instead of directly passing kfree().
>
> This prevents a cast warning:
>
> lib/kunit/kunit-test.c:565:25: warning: cast from 'void (*)(const void *)'
> to 'kunit_action_t *' (aka 'void (*)(void *)') converts to incompatible
> function type [-Wcast-function-type-strict]
>
> 564 full_log = string_stream_get_string(test->log);
> > 565 kunit_add_action(test, (kunit_action_t *)kfree, full_log);
>
> Signed-off-by: Richard Fitzgerald <[email protected]>
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Fixes: 05e2006ce493 ("kunit: Use string_stream for test log")
> ---

Looks good to me, thanks!

Reviewed-by: David Gow <[email protected]>

Cheers,
-- David

---

Attachments:

smime.p7s (3.91 kB)
S/MIME Cryptographic Signature