Skip to content

Commit 3893c4f

Browse files
committed
Windows: Fix broken WDK compilation
* void function call was returning a value * introduced in 6d8dfe0 * also fix whitespaces
1 parent b4c2ed5 commit 3893c4f

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

libusb/os/windows_usb.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,7 +1553,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered
15531553
parent_priv = _device_priv(parent_dev);
15541554
// virtual USB devices are also listed during GEN - don't process these yet
15551555
if ( (pass == GEN_PASS) && (parent_priv->apib->id != USB_API_HUB) ) {
1556-
libusb_unref_device(parent_dev);
1556+
libusb_unref_device(parent_dev);
15571557
continue;
15581558
}
15591559
break;
@@ -1580,16 +1580,16 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered
15801580
usbi_dbg("found existing device for session [%X] (%d.%d)",
15811581
session_id, dev->bus_number, dev->device_address);
15821582
}
1583-
// Keep track of devices that need unref
1584-
unref_list[unref_cur++] = dev;
1585-
if (unref_cur >= unref_size) {
1586-
unref_size += 64;
1587-
unref_list = usbi_reallocf(unref_list, unref_size*sizeof(libusb_device*));
1588-
if (unref_list == NULL) {
1589-
usbi_err(ctx, "could not realloc list for unref - aborting.");
1590-
LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
1591-
}
1592-
}
1583+
// Keep track of devices that need unref
1584+
unref_list[unref_cur++] = dev;
1585+
if (unref_cur >= unref_size) {
1586+
unref_size += 64;
1587+
unref_list = usbi_reallocf(unref_list, unref_size*sizeof(libusb_device*));
1588+
if (unref_list == NULL) {
1589+
usbi_err(ctx, "could not realloc list for unref - aborting.");
1590+
LOOP_BREAK(LIBUSB_ERROR_NO_MEM);
1591+
}
1592+
}
15931593
priv = _device_priv(dev);
15941594
}
15951595

@@ -1675,7 +1675,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered
16751675
break;
16761676
}
16771677
}
1678-
libusb_unref_device(parent_dev);
1678+
libusb_unref_device(parent_dev);
16791679
break;
16801680
}
16811681
}
@@ -2116,7 +2116,8 @@ static void windows_handle_callback (struct usbi_transfer *itransfer, uint32_t i
21162116
windows_transfer_callback (itransfer, io_result, io_size);
21172117
break;
21182118
case LIBUSB_TRANSFER_TYPE_BULK_STREAM:
2119-
return LIBUSB_ERROR_NOT_SUPPORTED;
2119+
usbi_warn(ITRANSFER_CTX(itransfer), "bulk stream transfers are not yet supported on this platform");
2120+
break;
21202121
default:
21212122
usbi_err(ITRANSFER_CTX(itransfer), "unknown endpoint type %d", transfer->type);
21222123
}

libusb/version_nano.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define LIBUSB_NANO 10885
1+
#define LIBUSB_NANO 10886

0 commit comments

Comments
 (0)