diff options
| -rw-r--r-- | lib/asyn-ares.c | 2 | ||||
| -rw-r--r-- | lib/cookie.c | 2 | ||||
| -rw-r--r-- | lib/http_negotiate_sspi.c | 6 | ||||
| -rw-r--r-- | lib/idn_win32.c | 4 | ||||
| -rw-r--r-- | src/urlglob.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 6027cc7ba..4165a451d 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -572,7 +572,7 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn, conn->async.done = FALSE; /* not done */ conn->async.status = 0; /* clear */ conn->async.dns = NULL; /* clear */ - res = (struct ResolverResults *)calloc(sizeof(struct ResolverResults),1); + res = calloc(sizeof(struct ResolverResults),1); if(!res) { Curl_safefree(conn->async.hostname); conn->async.hostname = NULL; diff --git a/lib/cookie.c b/lib/cookie.c index 7928be7dc..301beaee7 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -877,7 +877,7 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, size_t i; /* alloc an array and store all cookie pointers */ - array = (struct Cookie **)malloc(sizeof(struct Cookie *) * matches); + array = malloc(sizeof(struct Cookie *) * matches); if(!array) goto fail; diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c index 0658c529a..809870168 100644 --- a/lib/http_negotiate_sspi.c +++ b/lib/http_negotiate_sspi.c @@ -143,7 +143,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, /* Allocate input and output buffers according to the max token size as indicated by the security package */ neg_ctx->max_token_length = SecurityPackage->cbMaxToken; - neg_ctx->output_token = (BYTE *)malloc(neg_ctx->max_token_length); + neg_ctx->output_token = malloc(neg_ctx->max_token_length); s_pSecFn->FreeContextBuffer(SecurityPackage); } @@ -157,8 +157,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, /* first call in a new negotation, we have to acquire credentials, and allocate memory for the context */ - neg_ctx->credentials = (CredHandle *)malloc(sizeof(CredHandle)); - neg_ctx->context = (CtxtHandle *)malloc(sizeof(CtxtHandle)); + neg_ctx->credentials = malloc(sizeof(CredHandle)); + neg_ctx->context = malloc(sizeof(CtxtHandle)); if(!neg_ctx->credentials || !neg_ctx->context) return -1; diff --git a/lib/idn_win32.c b/lib/idn_win32.c index 74abfb6d0..96d3f0959 100644 --- a/lib/idn_win32.c +++ b/lib/idn_win32.c @@ -43,7 +43,7 @@ static wchar_t *_curl_win32_UTF8_to_wchar(const char *str_utf8) int str_w_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str_utf8, -1, NULL, 0); if(str_w_len) { - str_w = (wchar_t *) malloc(str_w_len * sizeof(wchar_t)); + str_w = malloc(str_w_len * sizeof(wchar_t)); if(str_w) { if(MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w, str_w_len) == 0) { @@ -65,7 +65,7 @@ static const char *_curl_win32_wchar_to_UTF8(const wchar_t *str_w) size_t str_utf8_len = WideCharToMultiByte(CP_UTF8, 0, str_w, -1, NULL, 0, NULL, NULL); if(str_utf8_len) { - str_utf8 = (char *) malloc(str_utf8_len * sizeof(wchar_t)); + str_utf8 = malloc(str_utf8_len * sizeof(wchar_t)); if(str_utf8) { if(WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, str_utf8_len, NULL, FALSE) == 0) { diff --git a/src/urlglob.c b/src/urlglob.c index 457e32cd6..2bbadabb2 100644 --- a/src/urlglob.c +++ b/src/urlglob.c @@ -71,7 +71,7 @@ static GlobCode glob_set(URLGlob *glob, char *pattern, 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); + pat->content.Set.elements = malloc(0); ++glob->size; while(!done) { |