From 861b647e7b1da564b831a5b07312a30feb7b6c58 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 6 Sep 2008 04:28:43 +0000 Subject: [PATCH] remove unnecessary typecasting of realloc() --- ares/ares_parse_ptr_reply.c | 2 +- docs/examples/curlx.c | 2 +- docs/examples/getinmemory.c | 4 +++- lib/base64.c | 2 +- lib/http.c | 2 +- lib/http_chunks.c | 2 +- lib/http_digest.c | 2 +- lib/mprintf.c | 2 +- lib/transfer.c | 4 ++-- lib/url.c | 3 +-- packages/OS400/ccsidcurl.c | 3 +-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c index 070bce865..cce6471c5 100644 --- a/ares/ares_parse_ptr_reply.c +++ b/ares/ares_parse_ptr_reply.c @@ -119,7 +119,7 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr, strncpy(aliases[aliascnt], rr_data, strlen(rr_data)+1); aliascnt++; if ((aliascnt%8)==0) - aliases = (char **) realloc(aliases, (aliascnt/16+1) * sizeof(char *)); + aliases = realloc(aliases, (aliascnt/16+1) * sizeof(char *)); } if (rr_class == C_IN && rr_type == T_CNAME) diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c index bd192865f..521812b9a 100644 --- a/docs/examples/curlx.c +++ b/docs/examples/curlx.c @@ -469,7 +469,7 @@ int main(int argc, char **argv) { i+=lu; if (i== tabLength) { tabLength+=100; - binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */ + binaryptr=realloc(binaryptr,tabLength); /* should be more careful */ } } tabLength = i; diff --git a/docs/examples/getinmemory.c b/docs/examples/getinmemory.c index fc1f87a91..c92482166 100644 --- a/docs/examples/getinmemory.c +++ b/docs/examples/getinmemory.c @@ -26,6 +26,8 @@ struct MemoryStruct { size_t size; }; +static void *myrealloc(void *ptr, size_t size); + static void *myrealloc(void *ptr, size_t size) { /* There might be a realloc() out there that doesn't like reallocing @@ -42,7 +44,7 @@ WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data) size_t realsize = size * nmemb; struct MemoryStruct *mem = (struct MemoryStruct *)data; - mem->memory = (char *)myrealloc(mem->memory, mem->size + realsize + 1); + mem->memory = myrealloc(mem->memory, mem->size + realsize + 1); if (mem->memory) { memcpy(&(mem->memory[mem->size]), ptr, realsize); mem->size += realsize; diff --git a/lib/base64.c b/lib/base64.c index 9dbf9f4ea..0453624fb 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -356,7 +356,7 @@ void *suck(int *lenptr) do { cursize *= 2; - buf = (unsigned char *)realloc(buf, cursize); + buf = realloc(buf, cursize); memset(buf + len, 0, cursize - len); lastread = fread(buf + len, 1, cursize - len, stdin); len += lastread; diff --git a/lib/http.c b/lib/http.c index 77a99cc6a..3b05184ad 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1190,7 +1190,7 @@ CURLcode add_buffer(send_buffer *in, const void *inptr, size_t size) if(in->buffer) /* we have a buffer, enlarge the existing one */ - new_rb = (char *)realloc(in->buffer, new_size); + new_rb = realloc(in->buffer, new_size); else /* create a new buffer */ new_rb = (char *)malloc(new_size); diff --git a/lib/http_chunks.c b/lib/http_chunks.c index ad9783404..45199866f 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -305,7 +305,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn, char *ptr; if(conn->trlMax) { conn->trlMax *= 2; - ptr = (char*)realloc(conn->trailer,conn->trlMax); + ptr = realloc(conn->trailer,conn->trlMax); } else { conn->trlMax=128; diff --git a/lib/http_digest.c b/lib/http_digest.c index ddeb93747..a3c2ad7d7 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -460,7 +460,7 @@ CURLcode Curl_output_digest(struct connectdata *conn, } /* append CRLF to the userpwd header */ - tmp = (char*) realloc(*allocuserpwd, strlen(*allocuserpwd) + 3 + 1); + tmp = realloc(*allocuserpwd, strlen(*allocuserpwd) + 3 + 1); if(!tmp) return CURLE_OUT_OF_MEMORY; strcat(tmp, "\r\n"); diff --git a/lib/mprintf.c b/lib/mprintf.c index 02a25f6de..255eb11df 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -1079,7 +1079,7 @@ static int alloc_addbyter(int output, FILE *data) else if(infop->len+1 >= infop->alloc) { char *newptr; - newptr = (char *)realloc(infop->buffer, infop->alloc*2); + newptr = realloc(infop->buffer, infop->alloc*2); if(!newptr) { infop->fail = 1; diff --git a/lib/transfer.c b/lib/transfer.c index 36b1953fc..baf7c19e8 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -702,7 +702,7 @@ static CURLcode readwrite_headers(struct SessionHandle *data, size_t newsize=CURLMAX((k->hbuflen+*nread)*3/2, data->state.headersize*2); hbufp_index = k->hbufp - data->state.headerbuff; - newbuff = (char *)realloc(data->state.headerbuff, newsize); + newbuff = realloc(data->state.headerbuff, newsize); if(!newbuff) { failf (data, "Failed to alloc memory for big header!"); return CURLE_OUT_OF_MEMORY; @@ -747,7 +747,7 @@ static CURLcode readwrite_headers(struct SessionHandle *data, size_t newsize=CURLMAX((k->hbuflen+full_length)*3/2, data->state.headersize*2); hbufp_index = k->hbufp - data->state.headerbuff; - newbuff = (char *)realloc(data->state.headerbuff, newsize); + newbuff = realloc(data->state.headerbuff, newsize); if(!newbuff) { failf (data, "Failed to alloc memory for big header!"); return CURLE_OUT_OF_MEMORY; diff --git a/lib/url.c b/lib/url.c index cf661f2aa..7bd812628 100644 --- a/lib/url.c +++ b/lib/url.c @@ -602,8 +602,7 @@ CURLcode Curl_ch_connc(struct SessionHandle *data, data->state.lastconnect = -1; } if(newamount > 0) { - newptr= (struct connectdata **) - realloc(c->connects, sizeof(struct connectdata *) * newamount); + newptr = realloc(c->connects, sizeof(struct connectdata *) * newamount); if(!newptr) /* we closed a few connections in vain, but so what? */ return CURLE_OUT_OF_MEMORY; diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index c44db0e1c..27412afa2 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -749,8 +749,7 @@ curl_formadd_ccsid(struct curl_httppost * * httppost, if (nargs >= lformlen) { lformlen += ALLOC_GRANULE; - tforms = (struct curl_forms *) realloc((char *) lforms, - lformlen * sizeof *lforms); + tforms = realloc(lforms, lformlen * sizeof *lforms); if (!tforms) { result = CURL_FORMADD_MEMORY;