From 25a940a549d2274d6b00df4376eeac4685c9f468 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 3 Jan 2020 18:06:54 -0800 Subject: [PATCH] litest: Fix warnings about discarded qualifiers with check-0.13.0 check 0.13.0 introduced a new struct type TTest for test functions instead of just a function. However, now the tcase_add_* functions use `const Ttest *`, and since litest stores the test case in a `void *`, we get warnings like the following: ../test/test-touchpad.c:7079:30: warning: passing argument 3 of '_litest_add' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] litest_add("touchpad:fuzz", touchpad_fuzz, LITEST_TOUCHPAD, LITEST_ANY); To fix this, use `const void *`, which is compatible with both APIs. Signed-off-by: Michael Forney --- test/litest.c | 24 ++++++++++++------------ test/litest.h | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/litest.c b/test/litest.c index 5325720a..f93eb990 100644 --- a/test/litest.c +++ b/test/litest.c @@ -243,7 +243,7 @@ struct test { struct list node; char *name; char *devname; - void *func; + const void *func; void *setup; void *teardown; @@ -309,7 +309,7 @@ litest_reload_udev_rules(void) static void litest_add_tcase_for_device(struct suite *suite, const char *funcname, - void *func, + const void *func, const struct litest_test_device *dev, const struct range *range) { @@ -330,7 +330,7 @@ litest_add_tcase_for_device(struct suite *suite, static void litest_add_tcase_no_device(struct suite *suite, - void *func, + const void *func, const char *funcname, const struct range *range) { @@ -356,7 +356,7 @@ litest_add_tcase_no_device(struct suite *suite, static void litest_add_tcase_deviceless(struct suite *suite, - void *func, + const void *func, const char *funcname, const struct range *range) { @@ -422,7 +422,7 @@ get_suite(const char *name) static void litest_add_tcase(const char *suite_name, const char *funcname, - void *func, + const void *func, int64_t required, int64_t excluded, const struct range *range) @@ -506,7 +506,7 @@ litest_add_tcase(const char *suite_name, } void -_litest_add_no_device(const char *name, const char *funcname, void *func) +_litest_add_no_device(const char *name, const char *funcname, const void *func) { _litest_add(name, funcname, func, LITEST_DISABLE_DEVICE, LITEST_DISABLE_DEVICE); } @@ -514,7 +514,7 @@ _litest_add_no_device(const char *name, const char *funcname, void *func) void _litest_add_ranged_no_device(const char *name, const char *funcname, - void *func, + const void *func, const struct range *range) { _litest_add_ranged(name, @@ -528,7 +528,7 @@ _litest_add_ranged_no_device(const char *name, void _litest_add_deviceless(const char *name, const char *funcname, - void *func) + const void *func) { _litest_add_ranged(name, funcname, @@ -541,7 +541,7 @@ _litest_add_deviceless(const char *name, void _litest_add(const char *name, const char *funcname, - void *func, + const void *func, int64_t required, int64_t excluded) { @@ -556,7 +556,7 @@ _litest_add(const char *name, void _litest_add_ranged(const char *name, const char *funcname, - void *func, + const void *func, int64_t required, int64_t excluded, const struct range *range) @@ -567,7 +567,7 @@ _litest_add_ranged(const char *name, void _litest_add_for_device(const char *name, const char *funcname, - void *func, + const void *func, enum litest_device_type type) { _litest_add_ranged_for_device(name, funcname, func, type, NULL); @@ -576,7 +576,7 @@ _litest_add_for_device(const char *name, void _litest_add_ranged_for_device(const char *name, const char *funcname, - void *func, + const void *func, enum litest_device_type type, const struct range *range) { diff --git a/test/litest.h b/test/litest.h index 5d0114e8..ab66ff9e 100644 --- a/test/litest.h +++ b/test/litest.h @@ -437,40 +437,40 @@ void litest_set_log_handler_bug(struct libinput *libinput); void _litest_add(const char *name, const char *funcname, - void *func, + const void *func, int64_t required_feature, int64_t excluded_feature); void _litest_add_ranged(const char *name, const char *funcname, - void *func, + const void *func, int64_t required, int64_t excluded, const struct range *range); void _litest_add_for_device(const char *name, const char *funcname, - void *func, + const void *func, enum litest_device_type type); void _litest_add_ranged_for_device(const char *name, const char *funcname, - void *func, + const void *func, enum litest_device_type type, const struct range *range); void _litest_add_no_device(const char *name, const char *funcname, - void *func); + const void *func); void _litest_add_ranged_no_device(const char *name, const char *funcname, - void *func, + const void *func, const struct range *range); void _litest_add_deviceless(const char *name, const char *funcname, - void *func); + const void *func); struct litest_device * litest_create_device(enum litest_device_type which);