depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'wip/hadess/poll-retval' into 'master'

Browse source 
poll: Fix fp_get_pollfds retval type

See merge request libfprint/libfprint!5
This commit is contained in:
Bastien Nocera 2018-06-26 13:18:40 +00:00
commit 21504c0621
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libfprint/fprint.h
View file

@ -314,7 +314,7 @@ struct fp_pollfd {
int fp_handle_events_timeout(struct timeval *timeout); int fp_handle_events_timeout(struct timeval *timeout);
int fp_handle_events(void); int fp_handle_events(void);
size_t fp_get_pollfds(struct fp_pollfd **pollfds); ssize_t fp_get_pollfds(struct fp_pollfd **pollfds);
int fp_get_next_timeout(struct timeval *tv); int fp_get_next_timeout(struct timeval *tv);
/** /**

4
libfprint/poll.c
View file

@ -313,12 +313,12 @@ API_EXPORTED int fp_get_next_timeout(struct timeval *tv)
* *
* Returns: the number of pollfds in the resultant list, or negative on error. * Returns: the number of pollfds in the resultant list, or negative on error.
*/ */
API_EXPORTED size_t fp_get_pollfds(struct fp_pollfd **pollfds) API_EXPORTED ssize_t fp_get_pollfds(struct fp_pollfd **pollfds)
{ {
const struct libusb_pollfd **usbfds; const struct libusb_pollfd **usbfds;
const struct libusb_pollfd *usbfd; const struct libusb_pollfd *usbfd;
struct fp_pollfd *ret; struct fp_pollfd *ret;
size_t cnt = 0; ssize_t cnt = 0;
size_t i = 0; size_t i = 0;
usbfds = libusb_get_pollfds(fpi_usb_ctx); usbfds = libusb_get_pollfds(fpi_usb_ctx);