diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-05-17 19:30:27 -0300 |
|---|---|---|
| committer | Daniel Drake <dan@reactivated.net> | 2010-05-17 19:30:27 -0300 |
| commit | d7031ee8e1c449af23b2674fe18d9fc652c9bd80 (patch) | |
| tree | d7f7a791881bde1892d6d9ab73a5e90a1522d10c /libusb/descriptor.c | |
| parent | 9996ccaed740f8fcec4287a478ccaaa573f9865a (diff) | |
| download | android_external_libusbx-d7031ee8e1c449af23b2674fe18d9fc652c9bd80.tar.gz android_external_libusbx-d7031ee8e1c449af23b2674fe18d9fc652c9bd80.tar.bz2 android_external_libusbx-d7031ee8e1c449af23b2674fe18d9fc652c9bd80.zip | |
Stricter types and casts
Diffstat (limited to 'libusb/descriptor.c')
| -rw-r--r-- | libusb/descriptor.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libusb/descriptor.c b/libusb/descriptor.c index acd7668..8f2d8e0 100644 --- a/libusb/descriptor.c +++ b/libusb/descriptor.c @@ -65,7 +65,7 @@ int usbi_parse_descriptor(unsigned char *source, char *descriptor, void *dest, } } - return sp - source; + return (int) (sp - source); } static void clear_endpoint(struct libusb_endpoint_descriptor *endpoint) @@ -592,7 +592,7 @@ err: int usbi_get_config_index_by_value(struct libusb_device *dev, uint8_t bConfigurationValue, int *idx) { - int i; + uint8_t i; usbi_dbg("value %d", bConfigurationValue); for (i = 0; i < dev->num_configurations; i++) { @@ -639,7 +639,7 @@ API_EXPORTED int libusb_get_config_descriptor_by_value(libusb_device *dev, else if (idx == -1) return LIBUSB_ERROR_NOT_FOUND; else - return libusb_get_config_descriptor(dev, idx, config); + return libusb_get_config_descriptor(dev, (uint8_t) idx, config); } /** \ingroup desc @@ -676,7 +676,8 @@ API_EXPORTED int libusb_get_string_descriptor_ascii(libusb_device_handle *dev, uint8_t desc_index, unsigned char *data, int length) { unsigned char tbuf[255]; /* Some devices choke on size > 255 */ - int r, langid, si, di; + int r, si, di; + uint16_t langid; /* Asking for the zero'th index is special - it returns a string * descriptor that contains all the language IDs supported by the device. |