fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-20 17:20:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mark three deprecated functions as such

Browse source 
These are deprecated, but were missing the deprecated attribute.
And fix up the tests that were still using those deprecated calls.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2013-10-04 16:00:38 +10:00
parent 3a4706796e
commit d9fcbd563a
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libevdev/libevdev.h
View file

@ -1438,7 +1438,7 @@ void libevdev_set_log_handler(struct libevdev *dev, libevdev_log_func_t logfunc)
int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED; int libevdev_get_event_type_max(unsigned int type) LIBEVDEV_DEPRECATED;
/** replacement: libevdev_property_get_name */ /** replacement: libevdev_property_get_name */
const char* libevdev_get_property_name(unsigned int prop); const char* libevdev_get_property_name(unsigned int prop) LIBEVDEV_DEPRECATED;
/** replacement: libevdev_event_type_get_name */ /** replacement: libevdev_event_type_get_name */
const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED; const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED;
@ -1446,10 +1446,10 @@ const char * libevdev_get_event_type_name(unsigned int type) LIBEVDEV_DEPRECATED
const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED; const char * libevdev_get_event_code_name(unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED;
/** replacement: libevdev_event_is_type */ /** replacement: libevdev_event_is_type */
int libevdev_is_event_type(const struct input_event *ev, unsigned int type); int libevdev_is_event_type(const struct input_event *ev, unsigned int type) LIBEVDEV_DEPRECATED;
/** replacement: libevdev_event_is_code */ /** replacement: libevdev_event_is_code */
int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code); int libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code) LIBEVDEV_DEPRECATED;
/**************************************/ /**************************************/
#ifdef __cplusplus #ifdef __cplusplus

32
test/test-event-names.c
View file

@ -197,14 +197,14 @@ END_TEST
START_TEST(test_prop_name) START_TEST(test_prop_name)
{ {
ck_assert_str_eq(libevdev_get_property_name(INPUT_PROP_POINTER), "INPUT_PROP_POINTER"); ck_assert_str_eq(libevdev_property_get_name(INPUT_PROP_POINTER), "INPUT_PROP_POINTER");
ck_assert_str_eq(libevdev_get_property_name(INPUT_PROP_DIRECT), "INPUT_PROP_DIRECT"); ck_assert_str_eq(libevdev_property_get_name(INPUT_PROP_DIRECT), "INPUT_PROP_DIRECT");
ck_assert_str_eq(libevdev_get_property_name(INPUT_PROP_BUTTONPAD), "INPUT_PROP_BUTTONPAD"); ck_assert_str_eq(libevdev_property_get_name(INPUT_PROP_BUTTONPAD), "INPUT_PROP_BUTTONPAD");
ck_assert_str_eq(libevdev_get_property_name(INPUT_PROP_SEMI_MT), "INPUT_PROP_SEMI_MT"); ck_assert_str_eq(libevdev_property_get_name(INPUT_PROP_SEMI_MT), "INPUT_PROP_SEMI_MT");
ck_assert_str_eq(libevdev_get_property_name(INPUT_PROP_MAX), "INPUT_PROP_MAX"); ck_assert_str_eq(libevdev_property_get_name(INPUT_PROP_MAX), "INPUT_PROP_MAX");
ck_assert(libevdev_get_property_name(INPUT_PROP_MAX - 1) == NULL); ck_assert(libevdev_property_get_name(INPUT_PROP_MAX - 1) == NULL);
ck_assert(libevdev_get_property_name(INPUT_PROP_MAX + 1) == NULL); ck_assert(libevdev_property_get_name(INPUT_PROP_MAX + 1) == NULL);
} }
END_TEST END_TEST
@ -227,13 +227,13 @@ START_TEST(test_event_type)
ev.type = EV_REL; ev.type = EV_REL;
ck_assert_int_eq(libevdev_is_event_type(&ev, EV_REL), 1); ck_assert_int_eq(libevdev_event_is_type(&ev, EV_REL), 1);
for (i = 0; i < EV_CNT; i++) { for (i = 0; i < EV_CNT; i++) {
if (i == ev.type) if (i == ev.type)
continue; continue;
ck_assert_int_eq(libevdev_is_event_type(&ev, i), 0); ck_assert_int_eq(libevdev_event_is_type(&ev, i), 0);
} }
ck_assert_int_eq(libevdev_is_event_type(&ev, EV_MAX + 1), 0); ck_assert_int_eq(libevdev_event_is_type(&ev, EV_MAX + 1), 0);
} }
END_TEST END_TEST
@ -245,23 +245,23 @@ START_TEST(test_event_code)
ev.type = EV_REL; ev.type = EV_REL;
ev.code = REL_Y; ev.code = REL_Y;
ck_assert_int_eq(libevdev_is_event_code(&ev, EV_REL, REL_Y), 1); ck_assert_int_eq(libevdev_event_is_code(&ev, EV_REL, REL_Y), 1);
for (i = 0; i < EV_CNT; i++) { for (i = 0; i < EV_CNT; i++) {
int j; int j;
if (i == ev.type || i == EV_SYN) if (i == ev.type || i == EV_SYN)
continue; continue;
for (j = 0; j < libevdev_event_type_get_max(i); i++) { for (j = 0; j < libevdev_event_type_get_max(i); i++) {
ck_assert_int_eq(libevdev_is_event_code(&ev, i, j), 0); ck_assert_int_eq(libevdev_event_is_code(&ev, i, j), 0);
} }
} }
ck_assert_int_eq(libevdev_is_event_code(&ev, EV_MAX + 1, ev.code), 0); ck_assert_int_eq(libevdev_event_is_code(&ev, EV_MAX + 1, ev.code), 0);
ck_assert_int_eq(libevdev_is_event_code(&ev, EV_REL, REL_MAX + 1), 0); ck_assert_int_eq(libevdev_event_is_code(&ev, EV_REL, REL_MAX + 1), 0);
ev.type = EV_SYN; ev.type = EV_SYN;
ev.code = SYN_REPORT; ev.code = SYN_REPORT;
ck_assert_int_eq(libevdev_is_event_code(&ev, EV_SYN, SYN_REPORT), 1); ck_assert_int_eq(libevdev_event_is_code(&ev, EV_SYN, SYN_REPORT), 1);
ck_assert_int_eq(libevdev_is_event_code(&ev, EV_SYN, SYN_DROPPED), 0); ck_assert_int_eq(libevdev_event_is_code(&ev, EV_SYN, SYN_DROPPED), 0);
} }
END_TEST END_TEST

2
tools/libevdev-events.c
View file

@ -103,7 +103,7 @@ print_props(struct libevdev *dev)
for (i = 0; i <= INPUT_PROP_MAX; i++) { for (i = 0; i <= INPUT_PROP_MAX; i++) {
if (libevdev_has_property(dev, i)) if (libevdev_has_property(dev, i))
printf(" Property type %d (%s)\n", i, printf(" Property type %d (%s)\n", i,
libevdev_get_property_name(i)); libevdev_property_get_name(i));
} }
} }