romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 10:47:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove unnecessary typecasting of malloc()

Browse source
This commit is contained in:
Yang Tse 2008-09-06 05:29:05 +00:00
parent a622fd90b4
commit 59e378f48f
31 changed files with 68 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.c
View file

@ -932,7 +932,7 @@ AddMultiFiles (const char *file_name,
struct multi_files *multi;
struct multi_files *multi_type = NULL;
struct multi_files *multi_name = NULL;
multi = (struct multi_files *)malloc(sizeof(struct multi_files));
multi = malloc(sizeof(struct multi_files));
if (multi) {
memset(multi, 0, sizeof(struct multi_files));
multi->form.option = CURLFORM_FILE;
@ -945,7 +945,7 @@ AddMultiFiles (const char *file_name,
*multi_start = multi;
if (type_name) {
multi_type = (struct multi_files *)malloc(sizeof(struct multi_files));
multi_type = malloc(sizeof(struct multi_files));
if (multi_type) {
memset(multi_type, 0, sizeof(struct multi_files));
multi_type->form.option = CURLFORM_CONTENTTYPE;
@ -960,7 +960,7 @@ AddMultiFiles (const char *file_name,
}
}
if (show_filename) {
multi_name = (struct multi_files *)malloc(sizeof(struct multi_files));
multi_name = malloc(sizeof(struct multi_files));
if (multi_name) {
memset(multi_name, 0, sizeof(struct multi_files));
multi_name->form.option = CURLFORM_FILENAME;
@ -1192,8 +1192,7 @@ static int formparse(struct Configurable *config,
ptr = ptr->next;
++count;
}
forms =
(struct curl_forms *)malloc((count+1)*sizeof(struct curl_forms));
forms = malloc((count+1)*sizeof(struct curl_forms));
if (!forms)
{
fprintf(config->errors, "Error building form post!\n");
@ -3726,7 +3725,7 @@ static void FindWin32CACert(struct Configurable *config,
if(curlinfo->features & CURL_VERSION_SSL) {
DWORD buflen;
char *ptr = NULL;
char *retval = (char *) malloc(sizeof (TCHAR) * (MAX_PATH + 1));
char *retval = malloc(sizeof (TCHAR) * (MAX_PATH + 1));
if (!retval)
return;
retval[0] = '\0';
@ -4370,7 +4369,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
filep = curl_easy_escape(curl, filep, 0 /* use strlen */);
if(filep) {
char *urlbuffer=(char *)malloc(strlen(url) + strlen(filep) + 3);
char *urlbuffer = malloc(strlen(url) + strlen(filep) + 3);
if(!urlbuffer) {
helpf(config->errors, "out of memory\n");
return CURLE_OUT_OF_MEMORY;
@ -4471,7 +4470,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
/*
* Then append ? followed by the get fields to the url.
*/
urlbuffer=(char *)malloc(strlen(url) + strlen(httpgetfields) + 3);
urlbuffer = malloc(strlen(url) + strlen(httpgetfields) + 3);
if(!urlbuffer) {
helpf(config->errors, "out of memory\n");
return CURLE_OUT_OF_MEMORY;

3
src/urlglob.c
View file

@ -70,6 +70,7 @@ static GlobCode glob_set(URLGlob *glob, char *pattern,
pat->type = UPTSet;
pat->content.Set.size = 0;
pat->content.Set.ptr_s = 0;
/* FIXME: Here's a nasty zero size malloc */
pat->content.Set.elements = (char**)malloc(0);
++glob->size;
@ -335,7 +336,7 @@ int glob_url(URLGlob** glob, char* url, int *urlnum, FILE *error)
*/
URLGlob *glob_expand;
int amount;
char *glob_buffer=(char *)malloc(strlen(url)+1);
char *glob_buffer = malloc(strlen(url)+1);
*glob = NULL;
if(NULL == glob_buffer)