diff options
| author | Josh Gao <jmgao@google.com> | 2019-04-17 16:01:52 -0700 |
|---|---|---|
| committer | Nathan Hjelm <hjelmn@me.com> | 2019-07-07 22:02:25 -0600 |
| commit | 958ec5255ba5707197486dfe4827d153f48e91ba (patch) | |
| tree | 969f50be25c8acf08b2e6f8434774dbadd30049b | |
| parent | 0d353783b29c274af2a1554a2a1741a13f93bbb7 (diff) | |
| download | libusb-958ec5255ba5707197486dfe4827d153f48e91ba.tar.gz | |
Fix some -Wformat warnings.
Closes #561
Signed-off-by: Nathan Hjelm <hjelmn@me.com>
| -rw-r--r-- | libusb/io.c | 2 | ||||
| -rw-r--r-- | libusb/os/linux_usbfs.c | 8 | ||||
| -rw-r--r-- | libusb/os/windows_usbdk.c | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libusb/io.c b/libusb/io.c index 8ac9793..c3185bb 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -2163,7 +2163,7 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv) if (tv->tv_usec % 1000) timeout_ms++; - usbi_dbg("poll() %d fds with timeout in %dms", nfds, timeout_ms); + usbi_dbg("poll() %d fds with timeout in %dms", (int)nfds, timeout_ms); r = usbi_poll(fds, nfds, timeout_ms); usbi_dbg("poll() returned %d", r); if (r == 0) { diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c index 84f59c3..63fe592 100644 --- a/libusb/os/linux_usbfs.c +++ b/libusb/os/linux_usbfs.c @@ -666,7 +666,7 @@ static int sysfs_get_active_config(struct libusb_device *dev, int *config) close(fd); if (r < 0) { usbi_err(DEVICE_CTX(dev), - "read bConfigurationValue failed ret=%d errno=%d", r, errno); + "read bConfigurationValue failed ret=%zd errno=%d", r, errno); return LIBUSB_ERROR_IO; } else if (r == 0) { usbi_dbg("device unconfigured"); @@ -1006,7 +1006,7 @@ static int initialize_device(struct libusb_device *dev, uint8_t busnum, fd = wrapped_fd; r = lseek(fd, 0, SEEK_SET); if (r < 0) { - usbi_err(ctx, "seek failed ret=%d errno=%d", r, errno); + usbi_err(ctx, "seek failed ret=%zd errno=%d", r, errno); return LIBUSB_ERROR_IO; } } @@ -1220,7 +1220,7 @@ void linux_device_disconnected(uint8_t busnum, uint8_t devaddr) usbi_disconnect_device (dev); libusb_unref_device(dev); } else { - usbi_dbg("device not found for session %x", session_id); + usbi_dbg("device not found for session %lx", session_id); } } usbi_mutex_static_unlock(&active_contexts_lock); @@ -2430,7 +2430,7 @@ static int handle_bulk_completion(struct usbi_transfer *itransfer, unsigned char *target = transfer->buffer + itransfer->transferred; usbi_dbg("received %d bytes of surplus data", urb->actual_length); if (urb->buffer != target) { - usbi_dbg("moving surplus data from offset %d to offset %d", + usbi_dbg("moving surplus data from offset %zd to offset %zd", (unsigned char *) urb->buffer - transfer->buffer, target - transfer->buffer); memmove(target, urb->buffer, urb->actual_length); diff --git a/libusb/os/windows_usbdk.c b/libusb/os/windows_usbdk.c index fbccbd5..2b4f7e0 100644 --- a/libusb/os/windows_usbdk.c +++ b/libusb/os/windows_usbdk.c @@ -207,7 +207,7 @@ static int usbdk_get_session_id_for_device(struct libusb_context *ctx, char dev_identity[ARRAYSIZE(id->DeviceID) + ARRAYSIZE(id->InstanceID) + 1]; if (snprintf(dev_identity, sizeof(dev_identity), "%S%S", id->DeviceID, id->InstanceID) == -1) { - usbi_warn(ctx, "cannot form device identity", id->DeviceID); + usbi_warn(ctx, "cannot form device identity"); return LIBUSB_ERROR_NOT_SUPPORTED; } diff --git a/libusb/version_nano.h b/libusb/version_nano.h index f2a319d..1d13615 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11375 +#define LIBUSB_NANO 11376 |