summaryrefslogtreecommitdiff
path: root/libusb/descriptor.c
diff options
context:
space:
mode:
authorPete Batard <pbatard@gmail.com>2010-01-14 13:34:11 +0000
committerPete Batard <pbatard@gmail.com>2010-01-14 13:34:11 +0000
commit995c7df391d6011e624006bfbb610ace18f9488f (patch)
tree53c681c3a1dadd42eb3a536791076ad269d69f00 /libusb/descriptor.c
parente45233574257f5ffd409e830c0d1d32fc6b37d81 (diff)
downloadlibusb-995c7df391d6011e624006bfbb610ace18f9488f.tar.gz
fixed MSVC warnings (/W4 or MSVC6)
Diffstat (limited to 'libusb/descriptor.c')
-rw-r--r--libusb/descriptor.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index acd7668..5664934 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -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.