diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-01-06 22:16:58 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-01-06 22:16:58 -0800 |
| commit | f3758c1c89b049c9cdef4017195b4383aa38e777 (patch) | |
| tree | 80d159898482c8a1bce6e661d78165856bfc79cc | |
| parent | 871d1a471b463f68dce74964f870205bfcdf8136 (diff) | |
| download | libusb-f3758c1c89b049c9cdef4017195b4383aa38e777.tar.gz | |
Windows: Fix printf format specifiers in poll_windows.c
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
| -rw-r--r-- | libusb/os/poll_windows.c | 10 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c index 46f7358..9825607 100644 --- a/libusb/os/poll_windows.c +++ b/libusb/os/poll_windows.c @@ -590,9 +590,9 @@ int usbi_poll(struct pollfd *fds, unsigned int nfds, int timeout) // If nothing was triggered, wait on all fds that require it if ((timeout != 0) && (triggered == 0) && (nb_handles_to_wait_on != 0)) { if (timeout < 0) { - poll_dbg("starting infinite wait for %d handles...", (int)nb_handles_to_wait_on); + poll_dbg("starting infinite wait for %u handles...", (unsigned int)nb_handles_to_wait_on); } else { - poll_dbg("starting %d ms wait for %d handles...", timeout, (int)nb_handles_to_wait_on); + poll_dbg("starting %d ms wait for %u handles...", timeout, (unsigned int)nb_handles_to_wait_on); } ret = WaitForMultipleObjects(nb_handles_to_wait_on, handles_to_wait_on, FALSE, (timeout<0)?INFINITE:(DWORD)timeout); @@ -672,7 +672,7 @@ ssize_t usbi_write(int fd, const void *buf, size_t count) return -1; } - poll_dbg("set pipe event (fd = %d, thread = %08X)", _index, GetCurrentThreadId()); + poll_dbg("set pipe event (fd = %d, thread = %08X)", _index, (unsigned int)GetCurrentThreadId()); SetEvent(poll_fd[_index].overlapped->hEvent); poll_fd[_index].overlapped->Internal = STATUS_WAIT_0; // If two threads write on the pipe at the same time, we need to @@ -707,12 +707,12 @@ ssize_t usbi_read(int fd, void *buf, size_t count) } if (WaitForSingleObject(poll_fd[_index].overlapped->hEvent, INFINITE) != WAIT_OBJECT_0) { - usbi_warn(NULL, "waiting for event failed: %d", (int)GetLastError()); + usbi_warn(NULL, "waiting for event failed: %u", (unsigned int)GetLastError()); errno = EIO; goto out; } - poll_dbg("clr pipe event (fd = %d, thread = %08X)", _index, GetCurrentThreadId()); + poll_dbg("clr pipe event (fd = %d, thread = %08X)", _index, (unsigned int)GetCurrentThreadId()); poll_fd[_index].overlapped->InternalHigh--; // Don't reset unless we don't have any more events to process if (poll_fd[_index].overlapped->InternalHigh <= 0) { diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 15d7c76..87af2da 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11024 +#define LIBUSB_NANO 11025 |