diff options
| author | Ludovic Rousseau <ludovic.rousseau+github@gmail.com> | 2012-04-20 22:25:38 +0100 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2012-04-20 22:29:33 +0100 |
| commit | 36a7119bf296cecd4e910bef86908fd782224960 (patch) | |
| tree | cf6e0975e079f08fb88c09def76c79cfdeeccf69 | |
| parent | 2aad19b93d64490bbf85c21c042821f2a16a0d9a (diff) | |
| download | libusb-36a7119bf296cecd4e910bef86908fd782224960.tar.gz | |
Linux: Fix signed vs unsigned compiler warnings
os/linux_usbfs.c: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
| -rw-r--r-- | libusb/os/linux_usbfs.c | 8 | ||||
| -rw-r--r-- | libusb/version.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c index 416efc4..23454cb 100644 --- a/libusb/os/linux_usbfs.c +++ b/libusb/os/linux_usbfs.c @@ -139,7 +139,7 @@ struct linux_transfer_priv { enum reap_action reap_action; int num_urbs; - unsigned int num_retired; + int num_retired; enum libusb_transfer_status reap_status; /* next iso packet in user-supplied transfer to be populated */ @@ -1667,7 +1667,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) /* calculate how many URBs we need */ for (i = 0; i < num_packets; i++) { - int space_remaining = MAX_ISO_BUFFER_LENGTH - this_urb_len; + unsigned int space_remaining = MAX_ISO_BUFFER_LENGTH - this_urb_len; packet_len = transfer->iso_packet_desc[i].length; if (packet_len > space_remaining) { @@ -1694,7 +1694,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer) /* allocate + initialize each URB with the correct number of packets */ for (i = 0; i < num_urbs; i++) { struct usbfs_urb *urb; - int space_remaining_in_urb = MAX_ISO_BUFFER_LENGTH; + unsigned int space_remaining_in_urb = MAX_ISO_BUFFER_LENGTH; int urb_packet_offset = 0; unsigned char *urb_buffer_orig = urb_buffer; int j; @@ -2276,7 +2276,7 @@ static int op_handle_events(struct libusb_context *ctx, struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready) { int r; - int i = 0; + unsigned int i = 0; usbi_mutex_lock(&ctx->open_devs_lock); for (i = 0; i < nfds && num_ready > 0; i++) { diff --git a/libusb/version.h b/libusb/version.h index b4386fc..18aa054 100644 --- a/libusb/version.h +++ b/libusb/version.h @@ -9,7 +9,7 @@ #define LIBUSB_MICRO 10 #endif #ifndef LIBUSB_NANO -#define LIBUSB_NANO 10479 +#define LIBUSB_NANO 10480 #endif /* LIBUSB_RC is the release candidate suffix. Should normally be empty. */ #ifndef LIBUSB_RC |