linux_usbfs: use calloc for multiplication

calloc can do n, elemsize multiplication itself

* Closes #74

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 86ad1f2..9d9d00e 100644 (file)
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -1767,7 +1767,6 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer)
        int bulk_buffer_len, use_bulk_continuation;
        int r;
        int i;
-       size_t alloc_size;
 
        if (is_out && (transfer->flags & LIBUSB_TRANSFER_ADD_ZERO_PACKET) &&
                        !(dpriv->caps & USBFS_CAP_ZERO_PACKET))
@@ -1826,8 +1825,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer)
        }
        usbi_dbg("need %d urbs for new transfer with length %d", num_urbs,
                transfer->length);
-       alloc_size = num_urbs * sizeof(struct usbfs_urb);
-       urbs = calloc(1, alloc_size);
+       urbs = calloc(num_urbs, sizeof(struct usbfs_urb));
        if (!urbs)
                return LIBUSB_ERROR_NO_MEM;
        tpriv->urbs = urbs;
@@ -1969,8 +1967,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer)
        }
        usbi_dbg("need %d %dk URBs for transfer", num_urbs, MAX_ISO_BUFFER_LENGTH / 1024);
 
-       alloc_size = num_urbs * sizeof(*urbs);
-       urbs = calloc(1, alloc_size);
+       urbs = calloc(num_urbs, sizeof(*urbs));
        if (!urbs)
                return LIBUSB_ERROR_NO_MEM;
 

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 97cf890..f865dc3 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10989
+#define LIBUSB_NANO 10990