Page MenuHomeFreeBSD
Files F172197427

D2687.diff
No OneTemporary
Actions

D2687.diff
View Options

Index: head/lib/libusb/libusb10.c
===================================================================
--- head/lib/libusb/libusb10.c
+++ head/lib/libusb/libusb10.c
@@ -1008,7 +1008,6 @@
uint16_t iso_packets;
uint16_t i;
uint8_t status;
- uint8_t flags;
status = libusb20_tr_get_status(pxfer);
sxfer = libusb20_tr_get_priv_sc1(pxfer);
@@ -1016,7 +1015,7 @@
iso_packets = libusb20_tr_get_max_frames(pxfer);
if (sxfer == NULL)
- return; /* cancelled - nothing to do */
+ return; /* cancelled - nothing to do */
uxfer = (struct libusb_transfer *)(
((uint8_t *)sxfer) + sizeof(*sxfer));
@@ -1025,16 +1024,13 @@
iso_packets = uxfer->num_iso_packets;
if (iso_packets == 0)
- return; /* nothing to do */
+ return; /* nothing to do */
/* make sure that the number of ISOCHRONOUS packets is valid */
uxfer->num_iso_packets = iso_packets;
- flags = uxfer->flags;
-
switch (status) {
case LIBUSB20_TRANSFER_COMPLETED:
-
/* update actual length */
uxfer->actual_length = actlen;
for (i = 0; i != iso_packets; i++) {
@@ -1043,9 +1039,7 @@
}
libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED);
break;
-
case LIBUSB20_TRANSFER_START:
-
/* setup length(s) */
actlen = 0;
for (i = 0; i != iso_packets; i++) {
@@ -1064,7 +1058,6 @@
/* fork another USB transfer, if any */
libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint);
break;
-
default:
libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status));
break;
Index: head/lib/libusb/libusb20_desc.c
===================================================================
--- head/lib/libusb/libusb20_desc.c
+++ head/lib/libusb/libusb20_desc.c
@@ -517,9 +517,7 @@
* room for the
* complete structure:
*/
- uint16_t dummy;
-
- dummy = libusb20_me_encode(buf,
+ (void) libusb20_me_encode(buf,
0xFFFF - 3, ps->ptr);
} else {
bcopy(src_ptr, buf, src_len);
@@ -673,7 +671,6 @@
~(LIBUSB20_ME_STRUCT_ALIGN - 1)); /* align */
while (pd_count--) {
uint16_t temp;
- uint16_t dummy;
struct libusb20_me_struct *ps;
ps = LIBUSB20_ADD_BYTES(pd, pd_offset);
@@ -763,7 +760,7 @@
* Recursivly decode
* the next structure
*/
- dummy = libusb20_me_decode(buf,
+ (void) libusb20_me_decode(buf,
temp, ps->ptr);
} else {
/* update type */

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 17, 7:13 PM (17 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
39100573
Default Alt Text
D2687.diff (2 KB)

Event Timeline