summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libusb/core.c6
-rw-r--r--libusb/descriptor.c85
-rw-r--r--libusb/hotplug.c4
-rw-r--r--libusb/io.c7
-rw-r--r--libusb/libusb.h16
-rw-r--r--libusb/os/linux_udev.c12
-rw-r--r--libusb/os/linux_usbfs.c4
-rw-r--r--libusb/os/poll_windows.c4
-rw-r--r--libusb/os/sunos_usb.c22
-rw-r--r--libusb/os/windows_winusb.h2
-rw-r--r--libusb/strerror.c2
-rw-r--r--libusb/sync.c14
-rw-r--r--libusb/version_nano.h2
13 files changed, 87 insertions, 93 deletions
diff --git a/libusb/core.c b/libusb/core.c
index 446ed83..228f898 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -922,7 +922,7 @@ uint8_t API_EXPORTED libusb_get_port_number(libusb_device *dev)
* \returns LIBUSB_ERROR_OVERFLOW if the array is too small
*/
int API_EXPORTED libusb_get_port_numbers(libusb_device *dev,
- uint8_t* port_numbers, int port_numbers_len)
+ uint8_t *port_numbers, int port_numbers_len)
{
int i = port_numbers_len;
struct libusb_context *ctx = DEVICE_CTX(dev);
@@ -948,7 +948,7 @@ int API_EXPORTED libusb_get_port_numbers(libusb_device *dev,
* \deprecated Please use \ref libusb_get_port_numbers() instead.
*/
int API_EXPORTED libusb_get_port_path(libusb_context *ctx, libusb_device *dev,
- uint8_t* port_numbers, uint8_t port_numbers_len)
+ uint8_t *port_numbers, uint8_t port_numbers_len)
{
UNUSED(ctx);
@@ -2370,7 +2370,7 @@ err_unlock:
* before your application terminates.
* \param ctx the context to deinitialize, or NULL for the default context
*/
-void API_EXPORTED libusb_exit(struct libusb_context *ctx)
+void API_EXPORTED libusb_exit(libusb_context *ctx)
{
struct libusb_device *dev, *next;
struct timeval tv = { 0, 0 };
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index c926544..ac3faaa 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -77,7 +77,7 @@ static void parse_descriptor(const void *source, const char *descriptor, void *d
static void clear_endpoint(struct libusb_endpoint_descriptor *endpoint)
{
- free((void *) endpoint->extra);
+ free((void *)endpoint->extra);
}
static int parse_endpoint(struct libusb_context *ctx,
@@ -149,20 +149,15 @@ static int parse_endpoint(struct libusb_context *ctx,
/* Copy any unknown descriptors into a storage area for drivers */
/* to later parse */
len = (int)(buffer - begin);
- if (len <= 0) {
- endpoint->extra = NULL;
- endpoint->extra_length = 0;
+ if (len <= 0)
return parsed;
- }
extra = malloc((size_t)len);
- endpoint->extra = extra;
- if (!extra) {
- endpoint->extra_length = 0;
+ if (!extra)
return LIBUSB_ERROR_NO_MEM;
- }
memcpy(extra, begin, len);
+ endpoint->extra = extra;
endpoint->extra_length = len;
return parsed;
@@ -178,16 +173,17 @@ static void clear_interface(struct libusb_interface *usb_interface)
struct libusb_interface_descriptor *ifp =
(struct libusb_interface_descriptor *)
usb_interface->altsetting + i;
- free((void *) ifp->extra);
+
+ free((void *)ifp->extra);
if (ifp->endpoint) {
for (j = 0; j < ifp->bNumEndpoints; j++)
clear_endpoint((struct libusb_endpoint_descriptor *)
ifp->endpoint + j);
}
- free((void *) ifp->endpoint);
+ free((void *)ifp->endpoint);
}
}
- free((void *) usb_interface->altsetting);
+ free((void *)usb_interface->altsetting);
usb_interface->altsetting = NULL;
}
@@ -201,16 +197,14 @@ static int parse_interface(libusb_context *ctx,
int interface_number = -1;
struct usbi_descriptor_header *header;
struct libusb_interface_descriptor *ifp;
+ unsigned char *extra;
unsigned char *begin;
- usb_interface->num_altsetting = 0;
-
while (size >= LIBUSB_DT_INTERFACE_SIZE) {
- struct libusb_interface_descriptor *altsetting =
- (struct libusb_interface_descriptor *) usb_interface->altsetting;
- altsetting = usbi_reallocf(altsetting,
- sizeof(struct libusb_interface_descriptor) *
- ((size_t)usb_interface->num_altsetting + 1));
+ struct libusb_interface_descriptor *altsetting;
+
+ altsetting = usbi_reallocf((void *)usb_interface->altsetting,
+ sizeof(*altsetting) * (size_t)(usb_interface->num_altsetting + 1));
if (!altsetting) {
r = LIBUSB_ERROR_NO_MEM;
goto err;
@@ -288,24 +282,27 @@ static int parse_interface(libusb_context *ctx,
/* drivers to later parse */
len = (int)(buffer - begin);
if (len > 0) {
- ifp->extra = malloc((size_t)len);
- if (!ifp->extra) {
+ extra = malloc((size_t)len);
+ if (!extra) {
r = LIBUSB_ERROR_NO_MEM;
goto err;
}
- memcpy((unsigned char *) ifp->extra, begin, len);
+
+ memcpy(extra, begin, len);
+ ifp->extra = extra;
ifp->extra_length = len;
}
if (ifp->bNumEndpoints > 0) {
struct libusb_endpoint_descriptor *endpoint;
- endpoint = calloc(ifp->bNumEndpoints, sizeof(struct libusb_endpoint_descriptor));
- ifp->endpoint = endpoint;
+
+ endpoint = calloc(ifp->bNumEndpoints, sizeof(*endpoint));
if (!endpoint) {
r = LIBUSB_ERROR_NO_MEM;
goto err;
}
+ ifp->endpoint = endpoint;
for (i = 0; i < ifp->bNumEndpoints; i++) {
r = parse_endpoint(ctx, endpoint + i, buffer, size);
if (r < 0)
@@ -322,7 +319,7 @@ static int parse_interface(libusb_context *ctx,
}
/* We check to see if it's an alternate to this one */
- ifp = (struct libusb_interface_descriptor *) buffer;
+ ifp = (struct libusb_interface_descriptor *)buffer;
if (size < LIBUSB_DT_INTERFACE_SIZE ||
ifp->bDescriptorType != LIBUSB_DT_INTERFACE ||
ifp->bInterfaceNumber != interface_number)
@@ -343,8 +340,8 @@ static void clear_configuration(struct libusb_config_descriptor *config)
clear_interface((struct libusb_interface *)
config->interface + i);
}
- free((void *) config->interface);
- free((void *) config->extra);
+ free((void *)config->interface);
+ free((void *)config->extra);
}
static int parse_configuration(struct libusb_context *ctx,
@@ -354,6 +351,7 @@ static int parse_configuration(struct libusb_context *ctx,
int r;
struct usbi_descriptor_header *header;
struct libusb_interface *usb_interface;
+ unsigned char *extra;
if (size < LIBUSB_DT_CONFIG_SIZE) {
usbi_err(ctx, "short config descriptor read %d/%d",
@@ -381,17 +379,15 @@ static int parse_configuration(struct libusb_context *ctx,
return LIBUSB_ERROR_IO;
}
- usb_interface = calloc(config->bNumInterfaces, sizeof(struct libusb_interface));
- config->interface = usb_interface;
+ usb_interface = calloc(config->bNumInterfaces, sizeof(*usb_interface));
if (!usb_interface)
return LIBUSB_ERROR_NO_MEM;
+ config->interface = usb_interface;
+
buffer += config->bLength;
size -= config->bLength;
- config->extra = NULL;
- config->extra_length = 0;
-
for (i = 0; i < config->bNumInterfaces; i++) {
int len;
unsigned char *begin;
@@ -433,13 +429,14 @@ static int parse_configuration(struct libusb_context *ctx,
if (len > 0) {
/* FIXME: We should realloc and append here */
if (!config->extra_length) {
- config->extra = malloc((size_t)len);
- if (!config->extra) {
+ extra = malloc((size_t)len);
+ if (!extra) {
r = LIBUSB_ERROR_NO_MEM;
goto err;
}
- memcpy((unsigned char *) config->extra, begin, len);
+ memcpy(extra, begin, len);
+ config->extra = extra;
config->extra_length = len;
}
}
@@ -466,7 +463,7 @@ err:
static int raw_desc_to_config(struct libusb_context *ctx,
unsigned char *buf, int size, struct libusb_config_descriptor **config)
{
- struct libusb_config_descriptor *_config = malloc(sizeof(*_config));
+ struct libusb_config_descriptor *_config = calloc(1, sizeof(*_config));
int r;
if (!_config)
@@ -519,8 +516,7 @@ int API_EXPORTED libusb_get_device_descriptor(libusb_device *dev,
struct libusb_device_descriptor *desc)
{
usbi_dbg(" ");
- memcpy((unsigned char *) desc, (unsigned char *) &dev->device_descriptor,
- sizeof (dev->device_descriptor));
+ memcpy(desc, &dev->device_descriptor, sizeof(dev->device_descriptor));
return 0;
}
@@ -720,7 +716,7 @@ void API_EXPORTED libusb_free_config_descriptor(
* \returns another LIBUSB_ERROR code on error
*/
int API_EXPORTED libusb_get_ss_endpoint_companion_descriptor(
- struct libusb_context *ctx,
+ libusb_context *ctx,
const struct libusb_endpoint_descriptor *endpoint,
struct libusb_ss_endpoint_companion_descriptor **ep_comp)
{
@@ -800,8 +796,7 @@ static int parse_bos(struct libusb_context *ctx,
return LIBUSB_ERROR_IO;
}
- _bos = calloc (1,
- sizeof(*_bos) + bos_header.bNumDeviceCaps * sizeof(void *));
+ _bos = calloc(1, sizeof(*_bos) + bos_header.bNumDeviceCaps * sizeof(void *));
if (!_bos)
return LIBUSB_ERROR_NO_MEM;
@@ -886,7 +881,7 @@ int API_EXPORTED libusb_get_bos_descriptor(libusb_device_handle *dev_handle,
parse_descriptor(bos_header, "bbwb", &_bos);
usbi_dbg("found BOS descriptor: size %d bytes, %d capabilities",
_bos.wTotalLength, _bos.bNumDeviceCaps);
- bos_data = calloc(_bos.wTotalLength, 1);
+ bos_data = calloc(1, _bos.wTotalLength);
if (bos_data == NULL)
return LIBUSB_ERROR_NO_MEM;
@@ -934,7 +929,7 @@ void API_EXPORTED libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos)
* \returns a LIBUSB_ERROR code on error
*/
int API_EXPORTED libusb_get_usb_2_0_extension_descriptor(
- struct libusb_context *ctx,
+ libusb_context *ctx,
struct libusb_bos_dev_capability_descriptor *dev_cap,
struct libusb_usb_2_0_extension_descriptor **usb_2_0_extension)
{
@@ -990,7 +985,7 @@ void API_EXPORTED libusb_free_usb_2_0_extension_descriptor(
* \returns a LIBUSB_ERROR code on error
*/
int API_EXPORTED libusb_get_ss_usb_device_capability_descriptor(
- struct libusb_context *ctx,
+ libusb_context *ctx,
struct libusb_bos_dev_capability_descriptor *dev_cap,
struct libusb_ss_usb_device_capability_descriptor **ss_usb_device_cap)
{
@@ -1046,7 +1041,7 @@ void API_EXPORTED libusb_free_ss_usb_device_capability_descriptor(
* \returns 0 on success
* \returns a LIBUSB_ERROR code on error
*/
-int API_EXPORTED libusb_get_container_id_descriptor(struct libusb_context *ctx,
+int API_EXPORTED libusb_get_container_id_descriptor(libusb_context *ctx,
struct libusb_bos_dev_capability_descriptor *dev_cap,
struct libusb_container_id_descriptor **container_id)
{
diff --git a/libusb/hotplug.c b/libusb/hotplug.c
index 0880f29..e3e83c3 100644
--- a/libusb/hotplug.c
+++ b/libusb/hotplug.c
@@ -315,7 +315,7 @@ int API_EXPORTED libusb_hotplug_register_callback(libusb_context *ctx,
return LIBUSB_SUCCESS;
}
-void API_EXPORTED libusb_hotplug_deregister_callback(struct libusb_context *ctx,
+void API_EXPORTED libusb_hotplug_deregister_callback(libusb_context *ctx,
libusb_hotplug_callback_handle callback_handle)
{
struct libusb_hotplug_callback *hotplug_cb;
@@ -353,7 +353,7 @@ void API_EXPORTED libusb_hotplug_deregister_callback(struct libusb_context *ctx,
}
DEFAULT_VISIBILITY
-void * LIBUSB_CALL libusb_hotplug_get_user_data(struct libusb_context *ctx,
+void * LIBUSB_CALL libusb_hotplug_get_user_data(libusb_context *ctx,
libusb_hotplug_callback_handle callback_handle)
{
struct libusb_hotplug_callback *hotplug_cb;
diff --git a/libusb/io.c b/libusb/io.c
index 907d28e..b969633 100644
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -2079,7 +2079,7 @@ static int handle_timerfd_trigger(struct libusb_context *ctx)
if (r < 0)
goto out;
- /* arm for next timeout*/
+ /* arm for next timeout */
r = arm_timerfd_for_next_timeout(ctx);
out:
@@ -2780,12 +2780,12 @@ const struct libusb_pollfd ** LIBUSB_CALL libusb_get_pollfds(
goto out;
list_for_each_entry(ipollfd, &ctx->ipollfds, list, struct usbi_pollfd)
- ret[i++] = (struct libusb_pollfd *) ipollfd;
+ ret[i++] = (struct libusb_pollfd *)ipollfd;
ret[ctx->pollfds_cnt] = NULL;
out:
usbi_mutex_unlock(&ctx->event_data_lock);
- return (const struct libusb_pollfd **) ret;
+ return (const struct libusb_pollfd **)ret;
#else
usbi_err(ctx, "external polling of libusb's internal descriptors "\
"is not yet supported on Windows platforms");
@@ -2860,5 +2860,4 @@ void usbi_handle_disconnect(struct libusb_device_handle *dev_handle)
usbi_mutex_unlock(&to_cancel->lock);
usbi_handle_transfer_completion(to_cancel, LIBUSB_TRANSFER_NO_DEVICE);
}
-
}
diff --git a/libusb/libusb.h b/libusb/libusb.h
index ca3b1f5..da6b1e5 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -1365,7 +1365,7 @@ int LIBUSB_CALL libusb_get_config_descriptor_by_value(libusb_device *dev,
void LIBUSB_CALL libusb_free_config_descriptor(
struct libusb_config_descriptor *config);
int LIBUSB_CALL libusb_get_ss_endpoint_companion_descriptor(
- struct libusb_context *ctx,
+ libusb_context *ctx,
const struct libusb_endpoint_descriptor *endpoint,
struct libusb_ss_endpoint_companion_descriptor **ep_comp);
void LIBUSB_CALL libusb_free_ss_endpoint_companion_descriptor(
@@ -1374,18 +1374,18 @@ int LIBUSB_CALL libusb_get_bos_descriptor(libusb_device_handle *dev_handle,
struct libusb_bos_descriptor **bos);
void LIBUSB_CALL libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos);
int LIBUSB_CALL libusb_get_usb_2_0_extension_descriptor(
- struct libusb_context *ctx,
+ libusb_context *ctx,
struct libusb_bos_dev_capability_descriptor *dev_cap,
struct libusb_usb_2_0_extension_descriptor **usb_2_0_extension);
void LIBUSB_CALL libusb_free_usb_2_0_extension_descriptor(
struct libusb_usb_2_0_extension_descriptor *usb_2_0_extension);
int LIBUSB_CALL libusb_get_ss_usb_device_capability_descriptor(
- struct libusb_context *ctx,
+ libusb_context *ctx,
struct libusb_bos_dev_capability_descriptor *dev_cap,
struct libusb_ss_usb_device_capability_descriptor **ss_usb_device_cap);
void LIBUSB_CALL libusb_free_ss_usb_device_capability_descriptor(
struct libusb_ss_usb_device_capability_descriptor *ss_usb_device_cap);
-int LIBUSB_CALL libusb_get_container_id_descriptor(struct libusb_context *ctx,
+int LIBUSB_CALL libusb_get_container_id_descriptor(libusb_context *ctx,
struct libusb_bos_dev_capability_descriptor *dev_cap,
struct libusb_container_id_descriptor **container_id);
void LIBUSB_CALL libusb_free_container_id_descriptor(
@@ -1478,7 +1478,7 @@ static inline unsigned char *libusb_control_transfer_get_data(
static inline struct libusb_control_setup *libusb_control_transfer_get_setup(
struct libusb_transfer *transfer)
{
- return (struct libusb_control_setup *)(void *) transfer->buffer;
+ return (struct libusb_control_setup *)(void *)transfer->buffer;
}
/** \ingroup libusb_asyncio
@@ -1508,7 +1508,7 @@ static inline void libusb_fill_control_setup(unsigned char *buffer,
uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex,
uint16_t wLength)
{
- struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *) buffer;
+ struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *)buffer;
setup->bmRequestType = bmRequestType;
setup->bRequest = bRequest;
setup->wValue = libusb_cpu_to_le16(wValue);
@@ -1558,7 +1558,7 @@ static inline void libusb_fill_control_transfer(
unsigned char *buffer, libusb_transfer_cb_fn callback, void *user_data,
unsigned int timeout)
{
- struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *) buffer;
+ struct libusb_control_setup *setup = (struct libusb_control_setup *)(void *)buffer;
transfer->dev_handle = dev_handle;
transfer->endpoint = 0;
transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL;
@@ -2041,7 +2041,7 @@ void LIBUSB_CALL libusb_hotplug_deregister_callback(libusb_context *ctx,
* \param[in] ctx context this callback is registered with
* \param[in] callback_handle the handle of the callback to get the user_data of
*/
-void * LIBUSB_CALL libusb_hotplug_get_user_data(struct libusb_context *ctx,
+void * LIBUSB_CALL libusb_hotplug_get_user_data(libusb_context *ctx,
libusb_hotplug_callback_handle callback_handle);
/** \ingroup libusb_lib
diff --git a/libusb/os/linux_udev.c b/libusb/os/linux_udev.c
index 33a9174..e8fb198 100644
--- a/libusb/os/linux_udev.c
+++ b/libusb/os/linux_udev.c
@@ -38,7 +38,7 @@ static int udev_control_pipe[2] = {-1, -1};
static struct udev_monitor *udev_monitor = NULL;
static pthread_t linux_event_thread;
-static void udev_hotplug_event(struct udev_device* udev_dev);
+static void udev_hotplug_event(struct udev_device *udev_dev);
static void *linux_udev_event_thread_main(void *arg);
int linux_udev_start_event_monitor(void)
@@ -168,7 +168,7 @@ static void *linux_udev_event_thread_main(void *arg)
char dummy;
int r;
ssize_t nb;
- struct udev_device* udev_dev;
+ struct udev_device *udev_dev;
struct pollfd fds[] = {
{.fd = udev_control_pipe[0],
.events = POLLIN},
@@ -232,10 +232,10 @@ static int udev_device_info(struct libusb_context *ctx, int detached,
dev_node, *sys_name, -1);
}
-static void udev_hotplug_event(struct udev_device* udev_dev)
+static void udev_hotplug_event(struct udev_device *udev_dev)
{
- const char* udev_action;
- const char* sys_name = NULL;
+ const char *udev_action;
+ const char *sys_name = NULL;
uint8_t busnum = 0, devaddr = 0;
int detached;
int r;
@@ -314,7 +314,7 @@ int linux_udev_scan_devices(struct libusb_context *ctx)
void linux_udev_hotplug_poll(void)
{
- struct udev_device* udev_dev;
+ struct udev_device *udev_dev;
usbi_mutex_static_lock(&linux_hotplug_lock);
do {
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 14963d2..f5fbee1 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -1064,7 +1064,7 @@ void linux_device_disconnected(uint8_t busnum, uint8_t devaddr)
usbi_mutex_static_lock(&active_contexts_lock);
list_for_each_entry(ctx, &active_contexts_list, list, struct libusb_context) {
- dev = usbi_get_device_by_session_id (ctx, session_id);
+ dev = usbi_get_device_by_session_id(ctx, session_id);
if (dev) {
usbi_disconnect_device(dev);
libusb_unref_device(dev);
@@ -2272,7 +2272,7 @@ static int handle_bulk_completion(struct usbi_transfer *itransfer,
usbi_dbg("received %d bytes of surplus data", urb->actual_length);
if (urb->buffer != target) {
usbi_dbg("moving surplus data from offset %zu to offset %zu",
- (unsigned char *) urb->buffer - transfer->buffer,
+ (unsigned char *)urb->buffer - transfer->buffer,
target - transfer->buffer);
memmove(target, urb->buffer, urb->actual_length);
}
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c
index 5497088..bf9f7b7 100644
--- a/libusb/os/poll_windows.c
+++ b/libusb/os/poll_windows.c
@@ -113,7 +113,7 @@ static int install_fd(struct file_descriptor *fd)
if (fd_count == fd_table_size) {
struct file_descriptor **new_table;
- unsigned long* new_bitmap;
+ unsigned long *new_bitmap;
// Need to expand the fd table and bitmap
new_table = realloc(fd_table, (fd_table_size + FD_TABLE_INCR_SIZE) * sizeof(*new_table));
@@ -240,7 +240,7 @@ static DWORD poll_wait(const HANDLE *wait_handles, DWORD num_wait_handles, DWORD
{
struct wait_thread_data *thread_data;
HANDLE notify_event;
- HANDLE* handles;
+ HANDLE *handles;
int n, num_threads;
DWORD error, status;
diff --git a/libusb/os/sunos_usb.c b/libusb/os/sunos_usb.c
index 9a148ca..31857b4 100644
--- a/libusb/os/sunos_usb.c
+++ b/libusb/os/sunos_usb.c
@@ -247,10 +247,10 @@ sunos_new_string_list(void)
{
string_list_t *list;
- list = calloc(1, sizeof (string_list_t));
+ list = calloc(1, sizeof(string_list_t));
if (list == NULL)
return (NULL);
- list->string = calloc(DEFAULT_LISTSIZE, sizeof (char *));
+ list->string = calloc(DEFAULT_LISTSIZE, sizeof(char *));
if (list->string == NULL)
return (NULL);
list->nargs = 0;
@@ -269,7 +269,7 @@ sunos_append_to_string_list(string_list_t *list, const char *arg)
if ((list->nargs + 1) == list->listsize) { /* +1 is for NULL */
char **tmp = realloc(list->string,
- sizeof (char *) * (list->listsize + 1));
+ sizeof(char *) * (list->listsize + 1));
if (tmp == NULL) {
free(str);
return (-1);
@@ -864,17 +864,17 @@ sunos_check_device_and_status_open(struct libusb_device_handle *hdl,
/* create filename */
if (hpriv->config_index > 0) {
- (void) snprintf(cfg_num, sizeof (cfg_num), "cfg%d",
+ (void) snprintf(cfg_num, sizeof(cfg_num), "cfg%d",
hpriv->config_index + 1);
} else {
- bzero(cfg_num, sizeof (cfg_num));
+ bzero(cfg_num, sizeof(cfg_num));
}
if (hpriv->altsetting[ifc] > 0) {
- (void) snprintf(alt_num, sizeof (alt_num), ".%d",
+ (void) snprintf(alt_num, sizeof(alt_num), ".%d",
hpriv->altsetting[ifc]);
} else {
- bzero(alt_num, sizeof (alt_num));
+ bzero(alt_num, sizeof(alt_num));
}
(void) snprintf(filename, PATH_MAX, "%s/%sif%d%s%s%d",
@@ -929,7 +929,7 @@ sunos_check_device_and_status_open(struct libusb_device_handle *hdl,
return (errno);
} else {
- count = write(fdstat, &control, sizeof (control));
+ count = write(fdstat, &control, sizeof(control));
if (count != 1) {
/* this should have worked */
usbi_dbg("can't write to %s: errno %d (%s)",
@@ -1228,7 +1228,7 @@ sunos_do_async_io(struct libusb_transfer *transfer)
tpriv->transfer = transfer;
aiocb = &tpriv->aiocb;
- bzero(aiocb, sizeof (*aiocb));
+ bzero(aiocb, sizeof(*aiocb));
aiocb->aio_fildes = hpriv->eps[ep].datafd;
aiocb->aio_buf = transfer->buffer;
aiocb->aio_nbytes = transfer->length;
@@ -1517,8 +1517,8 @@ sunos_usb_get_status(int fd)
usbi_dbg("sunos_usb_get_status(): fd=%d", fd);
- ret = read(fd, &status, sizeof (status));
- if (ret == sizeof (status)) {
+ ret = read(fd, &status, sizeof(status));
+ if (ret == sizeof(status)) {
switch (status) {
case USB_LC_STAT_NOERROR:
usbi_dbg("No Error");
diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h
index 0340fe7..ef667bd 100644
--- a/libusb/os/windows_winusb.h
+++ b/libusb/os/windows_winusb.h
@@ -239,7 +239,7 @@ static inline void winusb_device_priv_release(struct libusb_device *dev)
struct driver_lookup {
char list[MAX_KEY_LENGTH + 1]; // REG_MULTI_SZ list of services (driver) names
const DWORD reg_prop; // SPDRP registry key to use to retrieve list
- const char* designation; // internal designation (for debug output)
+ const char *designation; // internal designation (for debug output)
};
/*
diff --git a/libusb/strerror.c b/libusb/strerror.c
index 920447d..9445fa9 100644
--- a/libusb/strerror.c
+++ b/libusb/strerror.c
@@ -154,7 +154,7 @@ static const char * const (*usbi_error_strings)[LIBUSB_ERROR_COUNT] = &usbi_loca
* used, and only 2 letter ISO 639-1 codes are accepted for it, such as "de".
* The optional region, country_region or codeset parts are ignored. This
* means that functions which return translatable strings will NOT honor the
- * specified encoding.
+ * specified encoding.
* All strings returned are encoded as UTF-8 strings.
*
* If libusb_setlocale() is not called, all messages will be in English.
diff --git a/libusb/sync.c b/libusb/sync.c
index 68774c6..eac7572 100644
--- a/libusb/sync.c
+++ b/libusb/sync.c
@@ -110,7 +110,7 @@ int API_EXPORTED libusb_control_transfer(libusb_device_handle *dev_handle,
if (!transfer)
return LIBUSB_ERROR_NO_MEM;
- buffer = (unsigned char*) malloc(LIBUSB_CONTROL_SETUP_SIZE + wLength);
+ buffer = malloc(LIBUSB_CONTROL_SETUP_SIZE + wLength);
if (!buffer) {
libusb_free_transfer(transfer);
return LIBUSB_ERROR_NO_MEM;
@@ -269,9 +269,9 @@ static int do_sync_bulk_transfer(struct libusb_device_handle *dev_handle,
* \returns LIBUSB_ERROR_BUSY if called from event handling context
* \returns another LIBUSB_ERROR code on other failures
*/
-int API_EXPORTED libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
- unsigned char endpoint, unsigned char *data, int length, int *transferred,
- unsigned int timeout)
+int API_EXPORTED libusb_bulk_transfer(libusb_device_handle *dev_handle,
+ unsigned char endpoint, unsigned char *data, int length,
+ int *transferred, unsigned int timeout)
{
return do_sync_bulk_transfer(dev_handle, endpoint, data, length,
transferred, timeout, LIBUSB_TRANSFER_TYPE_BULK);
@@ -321,9 +321,9 @@ int API_EXPORTED libusb_bulk_transfer(struct libusb_device_handle *dev_handle,
* \returns LIBUSB_ERROR_BUSY if called from event handling context
* \returns another LIBUSB_ERROR code on other error
*/
-int API_EXPORTED libusb_interrupt_transfer(
- struct libusb_device_handle *dev_handle, unsigned char endpoint,
- unsigned char *data, int length, int *transferred, unsigned int timeout)
+int API_EXPORTED libusb_interrupt_transfer(libusb_device_handle *dev_handle,
+ unsigned char endpoint, unsigned char *data, int length,
+ int *transferred, unsigned int timeout)
{
return do_sync_bulk_transfer(dev_handle, endpoint, data, length,
transferred, timeout, LIBUSB_TRANSFER_TYPE_INTERRUPT);
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 6188f4f..c00f71a 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11508
+#define LIBUSB_NANO 11509
View Lorry Controller Status