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

test: drop unnecessary return value

Browse source 
We abort if anything goes wrong anyway, so we never returned anything but
success.

Found by coverity.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Peter Hutterer 2016-03-04 07:10:33 +10:00
parent bf8e6b2982
commit 2a27abf824
3 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/test-common.c
View file

@ -46,9 +46,9 @@ void test_logfunc_ignore_error(enum libevdev_log_priority priority,
{ {
} }
int test_create_device(struct uinput_device **uidev_return, void test_create_device(struct uinput_device **uidev_return,
struct libevdev **dev_return, struct libevdev **dev_return,
...) ...)
{ {
int rc, fd; int rc, fd;
struct uinput_device *uidev; struct uinput_device *uidev;
@ -71,15 +71,13 @@ int test_create_device(struct uinput_device **uidev_return,
*uidev_return = uidev; *uidev_return = uidev;
*dev_return = dev; *dev_return = dev;
return rc == 0 ? rc : -errno;
} }
int test_create_abs_device(struct uinput_device **uidev_return, void test_create_abs_device(struct uinput_device **uidev_return,
struct libevdev **dev_return, struct libevdev **dev_return,
int nabs, int nabs,
const struct input_absinfo *abs, const struct input_absinfo *abs,
...) ...)
{ {
int rc, fd; int rc, fd;
struct uinput_device *uidev; struct uinput_device *uidev;
@ -117,6 +115,4 @@ int test_create_abs_device(struct uinput_device **uidev_return,
*uidev_return = uidev; *uidev_return = uidev;
*dev_return = dev; *dev_return = dev;
return rc == 0 ? rc : -errno;
} }

16
test/test-common.h
View file

@ -32,14 +32,14 @@
#include "test-common-uinput.h" #include "test-common-uinput.h"
int test_create_device(struct uinput_device **uidev, void test_create_device(struct uinput_device **uidev,
struct libevdev **dev, struct libevdev **dev,
...); ...);
int test_create_abs_device(struct uinput_device **uidev, void test_create_abs_device(struct uinput_device **uidev,
struct libevdev **dev, struct libevdev **dev,
int nabs, int nabs,
const struct input_absinfo *abs, const struct input_absinfo *abs,
...); ...);
void test_logfunc_abort_on_error(enum libevdev_log_priority priority, void test_logfunc_abort_on_error(enum libevdev_log_priority priority,
void *data, void *data,

16
test/test-libevdev-events.c
View file

@ -1748,10 +1748,10 @@ START_TEST(test_mt_tracking_id_discard)
abs[5].value = ABS_MT_TRACKING_ID; abs[5].value = ABS_MT_TRACKING_ID;
abs[5].maximum = 500; abs[5].maximum = 500;
rc = test_create_abs_device(&uidev, &dev, test_create_abs_device(&uidev, &dev,
6, abs, 6, abs,
EV_SYN, SYN_REPORT, EV_SYN, SYN_REPORT,
-1); -1);
uinput_device_event(uidev, EV_ABS, ABS_MT_SLOT, 1); uinput_device_event(uidev, EV_ABS, ABS_MT_SLOT, 1);
uinput_device_event(uidev, EV_ABS, ABS_MT_TRACKING_ID, 1); uinput_device_event(uidev, EV_ABS, ABS_MT_TRACKING_ID, 1);
@ -1831,10 +1831,10 @@ START_TEST(test_mt_tracking_id_discard_neg_1)
abs[5].value = ABS_MT_TRACKING_ID; abs[5].value = ABS_MT_TRACKING_ID;
abs[5].maximum = 500; abs[5].maximum = 500;
rc = test_create_abs_device(&uidev, &dev, test_create_abs_device(&uidev, &dev,
6, abs, 6, abs,
EV_SYN, SYN_REPORT, EV_SYN, SYN_REPORT,
-1); -1);
uinput_device_event(uidev, EV_ABS, ABS_MT_SLOT, 1); uinput_device_event(uidev, EV_ABS, ABS_MT_SLOT, 1);
uinput_device_event(uidev, EV_ABS, ABS_MT_TRACKING_ID, 1); uinput_device_event(uidev, EV_ABS, ABS_MT_TRACKING_ID, 1);
uinput_device_event(uidev, EV_SYN, SYN_REPORT, 0); uinput_device_event(uidev, EV_SYN, SYN_REPORT, 0);