diff options
| -rw-r--r-- | libusb/os/windows_nt_common.c | 2 | ||||
| -rw-r--r-- | libusb/os/windows_winusb.c | 8 | ||||
| -rw-r--r-- | libusb/os/windows_winusb.h | 11 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
4 files changed, 6 insertions, 17 deletions
diff --git a/libusb/os/windows_nt_common.c b/libusb/os/windows_nt_common.c index bbb61fc..d935394 100644 --- a/libusb/os/windows_nt_common.c +++ b/libusb/os/windows_nt_common.c @@ -519,7 +519,7 @@ void windows_handle_callback(struct usbi_transfer *itransfer, uint32_t io_result int windows_handle_events(struct libusb_context *ctx, struct pollfd *fds, POLL_NFDS_TYPE nfds, int num_ready) { - POLL_NFDS_TYPE i = 0; + POLL_NFDS_TYPE i; bool found = false; struct usbi_transfer *transfer; struct winfd *pollable_fd = NULL; diff --git a/libusb/os/windows_winusb.c b/libusb/os/windows_winusb.c index eea1221..70cf598 100644 --- a/libusb/os/windows_winusb.c +++ b/libusb/os/windows_winusb.c @@ -295,7 +295,7 @@ static SP_DEVICE_INTERFACE_DETAIL_DATA_A *get_interface_details(struct libusb_co HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, const GUID *guid, unsigned _index) { SP_DEVICE_INTERFACE_DATA dev_interface_data; - SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL; + SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details; DWORD size; if (_index <= 0) @@ -364,7 +364,7 @@ static SP_DEVICE_INTERFACE_DETAIL_DATA_A *get_interface_details_filter(struct li HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, const GUID *guid, unsigned _index, char *filter_path) { SP_DEVICE_INTERFACE_DATA dev_interface_data; - SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL; + SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details; DWORD size; if (_index <= 0) @@ -458,8 +458,8 @@ err_exit: static unsigned long get_ancestor_session_id(DWORD devinst, unsigned level) { DWORD parent_devinst; - unsigned long session_id = 0; - char *sanitized_path = NULL; + unsigned long session_id; + char *sanitized_path; char path[MAX_PATH_LENGTH]; unsigned i; diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h index 7e00f93..b7b9cd9 100644 --- a/libusb/os/windows_winusb.h +++ b/libusb/os/windows_winusb.h @@ -228,22 +228,11 @@ static inline struct windows_device_priv *windows_device_priv_init(struct libusb struct windows_device_priv *p = _device_priv(dev); int i; - p->depth = 0; - p->port = 0; - p->path = NULL; p->apib = &usb_api_backend[USB_API_UNSUPPORTED]; p->sub_api = SUB_API_NOTSET; - p->hid = NULL; - p->active_config = 0; - p->config_descriptor = NULL; - memset(&p->dev_descriptor, 0, sizeof(USB_DEVICE_DESCRIPTOR)); for (i = 0; i < USB_MAXINTERFACES; i++) { - p->usb_interface[i].path = NULL; p->usb_interface[i].apib = &usb_api_backend[USB_API_UNSUPPORTED]; p->usb_interface[i].sub_api = SUB_API_NOTSET; - p->usb_interface[i].nb_endpoints = 0; - p->usb_interface[i].endpoint = NULL; - p->usb_interface[i].restricted_functionality = false; } return p; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 2e3f9e4..80fc0df 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11175 +#define LIBUSB_NANO 11176 |