summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2019-04-17 16:02:18 -0700
committerNathan Hjelm <hjelmn@me.com>2019-07-07 21:56:41 -0600
commit4d05bf9621147e72f031235086f0f06234e525d7 (patch)
tree69c5c6bf2e3f850b467f0e51ec86382d23f45d6b
parentf0b804cf7212c4176c9a6a20ac9ba09356c89a5e (diff)
downloadlibusb-4d05bf9621147e72f031235086f0f06234e525d7.tar.gz
windows: fix return type of usbi_{inc,dec}_fds_ref.
These functions were declared as returning int, but failed to actually return anything, and no one was using their return values anyway. Closes #562 Signed-off-by: Nathan Hjelm <hjelmn@me.com>
-rw-r--r--libusb/os/poll_windows.c4
-rw-r--r--libusb/os/poll_windows.h4
-rw-r--r--libusb/version_nano.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c
index 208953b..5c57099 100644
--- a/libusb/os/poll_windows.c
+++ b/libusb/os/poll_windows.c
@@ -119,7 +119,7 @@ struct winfd usbi_create_fd(void)
return wfd;
}
-int usbi_inc_fds_ref(struct pollfd *fds, unsigned int nfds)
+void usbi_inc_fds_ref(struct pollfd *fds, unsigned int nfds)
{
int n;
usbi_mutex_static_lock(&fd_table_lock);
@@ -129,7 +129,7 @@ int usbi_inc_fds_ref(struct pollfd *fds, unsigned int nfds)
usbi_mutex_static_unlock(&fd_table_lock);
}
-int usbi_dec_fds_ref(struct pollfd *fds, unsigned int nfds)
+void usbi_dec_fds_ref(struct pollfd *fds, unsigned int nfds)
{
int n;
struct file_descriptor *fd;
diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h
index 980870d..a9a3909 100644
--- a/libusb/os/poll_windows.h
+++ b/libusb/os/poll_windows.h
@@ -71,8 +71,8 @@ ssize_t usbi_write(int fd, const void *buf, size_t count);
ssize_t usbi_read(int fd, void *buf, size_t count);
int usbi_close(int fd);
-int usbi_inc_fds_ref(struct pollfd *fds, unsigned int nfds);
-int usbi_dec_fds_ref(struct pollfd *fds, unsigned int nfds);
+void usbi_inc_fds_ref(struct pollfd *fds, unsigned int nfds);
+void usbi_dec_fds_ref(struct pollfd *fds, unsigned int nfds);
/*
* Timeval operations
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 7d50671..77a129a 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11371
+#define LIBUSB_NANO 11372