Get rid of useless wrapper function epoll_waiting

This commit is contained in:
twinaphex 2017-06-08 21:52:50 +02:00
parent eb08a86647
commit 8980f8c1ea
4 changed files with 2 additions and 9 deletions

View File

@ -43,11 +43,6 @@ void epoll_free(int *epoll_fd)
*epoll_fd = -1;
}
int epoll_waiting(int *epoll_fd, void *events, int maxevents, int timeout)
{
return epoll_wait(*epoll_fd, (struct epoll_event*)events, maxevents, timeout);
}
bool epoll_add(int *epoll_fd, int fd, void *device)
{
struct epoll_event event;

View File

@ -24,8 +24,6 @@ bool epoll_new(int *epoll_fd);
void epoll_free(int *epoll_fd);
int epoll_waiting(int *epoll_fd, void *events, int maxevents, int timeout);
bool epoll_add(int *epoll_fd, int fd, void *device);
#endif

View File

@ -492,7 +492,7 @@ static void udev_input_poll(void *data)
while (udev->monitor && hotplug_avail)
udev_input_handle_hotplug(udev);
ret = epoll_waiting(&udev->epfd, events, ARRAY_SIZE(events), 0);
ret = epoll_wait(udev->epfd, events, ARRAY_SIZE(events), 0);
for (i = 0; i < ret; i++)
{

View File

@ -128,7 +128,7 @@ static void linuxraw_joypad_poll(void)
struct epoll_event events[MAX_USERS + 1];
retry:
ret = epoll_waiting(&linuxraw_epoll, events, MAX_USERS + 1, 0);
ret = epoll_wait(linuxraw_epoll, events, MAX_USERS + 1, 0);
if (ret < 0 && errno == EINTR)
goto retry;