diff options
author | Pete Batard <pete@akeo.ie> | 2012-04-10 13:05:37 +0100 |
---|---|---|
committer | Peter Stuge <peter@stuge.se> | 2012-04-20 08:12:33 +0200 |
commit | d930865987de523061eca259a7fed11aea626831 (patch) | |
tree | d544a119d478fc373f5dbf8175a6dbbe5c87d5f6 | |
parent | df35117ce58b74fa530baaaccc30adaf432398ea (diff) | |
download | libusb-d930865987de523061eca259a7fed11aea626831.tar.gz |
Windows: Prefer calloc() over malloc() and cast all allocations
This silences VS2010 intellisense warnings on memory allocation.
libusbx.git commit 24d595aa71e7fd0f14d40e933a33f852f7269c8b
-rw-r--r-- | libusb/os/poll_windows.c | 8 | ||||
-rw-r--r-- | libusb/os/threads_windows.c | 2 | ||||
-rw-r--r-- | libusb/os/windows_usb.c | 21 |
3 files changed, 15 insertions, 16 deletions
diff --git a/libusb/os/poll_windows.c b/libusb/os/poll_windows.c index d883187..61e48f2 100644 --- a/libusb/os/poll_windows.c +++ b/libusb/os/poll_windows.c @@ -182,7 +182,7 @@ int _fd_to_index_and_lock(int fd) OVERLAPPED *create_overlapped(void) { - OVERLAPPED *overlapped = calloc(1, sizeof(OVERLAPPED)); + OVERLAPPED *overlapped = (OVERLAPPED*) calloc(1, sizeof(OVERLAPPED)); if (overlapped == NULL) { return NULL; } @@ -274,7 +274,7 @@ int usbi_pipe(int filedes[2]) CHECK_INIT_POLLING; - overlapped = calloc(1, sizeof(OVERLAPPED)); + overlapped = (OVERLAPPED*) calloc(1, sizeof(OVERLAPPED)); if (overlapped == NULL) { return -1; } @@ -572,8 +572,8 @@ int usbi_poll(struct pollfd *fds, unsigned int nfds, int timeout) CHECK_INIT_POLLING; triggered = 0; - handles_to_wait_on = malloc((nfds+1)*sizeof(HANDLE)); // +1 for fd_update - handle_to_index = malloc(nfds*sizeof(int)); + handles_to_wait_on = (HANDLE*) calloc(nfds+1, sizeof(HANDLE)); // +1 for fd_update + handle_to_index = (int*) calloc(nfds, sizeof(int)); if ((handles_to_wait_on == NULL) || (handle_to_index == NULL)) { errno = ENOMEM; triggered = -1; diff --git a/libusb/os/threads_windows.c b/libusb/os/threads_windows.c index fe2bfc1..1394bb0 100644 --- a/libusb/os/threads_windows.c +++ b/libusb/os/threads_windows.c @@ -142,7 +142,7 @@ static int __inline usbi_cond_intwait(usbi_cond_t *cond, } } if(!found) { - pos = malloc(sizeof(struct usbi_cond_perthread)); + pos = (struct usbi_cond_perthread*) calloc(1, sizeof(struct usbi_cond_perthread)); if(!pos) return ((errno=ENOMEM)); // This errno is not POSIX-allowed. pos->tid = tid; pos->event = CreateEvent(NULL, FALSE, FALSE, NULL); // auto-reset. diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 67274e7..47f6dec 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -332,7 +332,7 @@ static SP_DEVICE_INTERFACE_DETAIL_DATA_A *get_interface_details(struct libusb_co goto err_exit; } - if ((dev_interface_details = malloc(size)) == NULL) { + if ((dev_interface_details = (SP_DEVICE_INTERFACE_DETAIL_DATA_A*) calloc(size, 1)) == NULL) { usbi_err(ctx, "could not allocate interface data for index %u.", _index); goto err_exit; } @@ -506,7 +506,7 @@ static unsigned long htab_hash(char* str) // string (same hash, different string) at the same time is extremely low safe_free(htab_table[idx].str); htab_table[idx].used = hval; - htab_table[idx].str = malloc(safe_strlen(str)+1); + htab_table[idx].str = (char*) calloc(1, safe_strlen(str)+1); if (htab_table[idx].str == NULL) { usbi_err(NULL, "could not duplicate string for hash table"); usbi_mutex_unlock(&htab_write_mutex); @@ -576,7 +576,7 @@ static int windows_assign_endpoints(struct libusb_device_handle *dev_handle, int return LIBUSB_SUCCESS; } - priv->usb_interface[iface].endpoint = malloc(if_desc->bNumEndpoints); + priv->usb_interface[iface].endpoint = (uint8_t*) calloc(1, if_desc->bNumEndpoints); if (priv->usb_interface[iface].endpoint == NULL) { return LIBUSB_ERROR_NO_MEM; } @@ -605,7 +605,7 @@ static bool is_api_driver(char* driver, uint8_t api) size_t len = safe_strlen(driver); if (len == 0) return false; - tmp_str = calloc(len+1, 1); + tmp_str = (char*) calloc(1, len+1); if (tmp_str == NULL) return false; memcpy(tmp_str, driver, len+1); tok = strtok(tmp_str, sep_str); @@ -887,7 +887,7 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle if (dev->num_configurations == 0) return LIBUSB_ERROR_INVALID_PARAM; - priv->config_descriptor = malloc(dev->num_configurations * sizeof(PUSB_CONFIGURATION_DESCRIPTOR)); + priv->config_descriptor = (unsigned char**) calloc(dev->num_configurations, sizeof(PUSB_CONFIGURATION_DESCRIPTOR)); if (priv->config_descriptor == NULL) return LIBUSB_ERROR_NO_MEM; for (i=0; i<dev->num_configurations; i++) @@ -925,7 +925,7 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle } size = sizeof(USB_DESCRIPTOR_REQUEST) + cd_buf_short.data.wTotalLength; - if ((cd_buf_actual = (PUSB_DESCRIPTOR_REQUEST)malloc(size)) == NULL) { + if ((cd_buf_actual = (PUSB_DESCRIPTOR_REQUEST) calloc(1, size)) == NULL) { usbi_err(ctx, "could not allocate configuration descriptor buffer for '%s'.", device_id); LOOP_BREAK(LIBUSB_ERROR_NO_MEM); } @@ -961,10 +961,9 @@ static int cache_config_descriptors(struct libusb_device *dev, HANDLE hub_handle i, cd_data->bConfigurationValue, cd_data->wTotalLength); // Cache the descriptor - priv->config_descriptor[i] = malloc(cd_data->wTotalLength); + priv->config_descriptor[i] = (unsigned char*) calloc(1, cd_data->wTotalLength); if (priv->config_descriptor[i] == NULL) return LIBUSB_ERROR_NO_MEM; - memcpy(priv->config_descriptor[i], cd_data, cd_data->wTotalLength); } return LIBUSB_SUCCESS; @@ -1226,7 +1225,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered guid[DEV_PASS] = &GUID_DEVINTERFACE_USB_DEVICE; nb_guids = DEV_PASS+1; - unref_list = malloc(unref_size*sizeof(libusb_device*)); + unref_list = (libusb_device**) calloc(unref_size, sizeof(libusb_device*)); if (unref_list == NULL) { return LIBUSB_ERROR_NO_MEM; } @@ -1347,7 +1346,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered usbi_err(ctx, "program assertion failed: too many GUIDs"); LOOP_BREAK(LIBUSB_ERROR_OVERFLOW); } - if_guid = calloc(1, sizeof(GUID)); + if_guid = (GUID*) calloc(1, sizeof(GUID)); pCLSIDFromString(guid_string_w, if_guid); guid[nb_guids++] = if_guid; usbi_dbg("extra GUID: %s", guid_to_string(if_guid)); @@ -1456,7 +1455,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered break; default: // For other devices, the first interface is the same as the device - priv->usb_interface[0].path = malloc(safe_strlen(priv->path)+1); + priv->usb_interface[0].path = (char*) calloc(safe_strlen(priv->path)+1, 1); if (priv->usb_interface[0].path != NULL) { safe_strcpy(priv->usb_interface[0].path, safe_strlen(priv->path)+1, priv->path); } |