Module: wine Branch: master Commit: d7d40b7dd3c8e650be09e9882de7c4bb5e672481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d40b7dd3c8e650be09e9882d...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jul 3 23:56:55 2007 +0200
msvcrt: Remove superfluous casts of void pointers to other pointer types.
---
dlls/msvcrt/console.c | 2 +- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/process.c | 4 ++-- dlls/msvcrt/undname.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 013ed54..1e65832 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -259,7 +259,7 @@ int CDECL _cprintf(const char* format, ...) resize = (written == -1 ? resize * 2 : written + 1); if (mem != buf) MSVCRT_free (mem); - if (!(mem = (char *)MSVCRT_malloc(resize))) + if (!(mem = MSVCRT_malloc(resize))) return MSVCRT_EOF; va_start( valist, format ); } diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9badd72..990b753 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -79,7 +79,7 @@ MSVCRT__onexit_t CDECL __dllonexit(MSVCRT__onexit_t func, MSVCRT__onexit_t **sta if (++len <= 0) return NULL;
- tmp = (MSVCRT__onexit_t *)MSVCRT_realloc(*start, len * sizeof(tmp)); + tmp = MSVCRT_realloc(*start, len * sizeof(tmp)); if (!tmp) return NULL; *start = tmp; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1be1a10..805bc55 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3012,7 +3012,7 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, va_list valist) resize = (written == -1 ? resize * 2 : written + 1); if (mem != buf) MSVCRT_free (mem); - if (!(mem = (char *)MSVCRT_malloc(resize))) + if (!(mem = MSVCRT_malloc(resize))) return MSVCRT_EOF; } retval = MSVCRT_fwrite(mem, sizeof(*mem), written, file); @@ -3038,7 +3038,7 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_l resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t)); if (mem != buf) MSVCRT_free (mem); - if (!(mem = (MSVCRT_wchar_t *)MSVCRT_malloc(resize*sizeof(*mem)))) + if (!(mem = MSVCRT_malloc(resize*sizeof(*mem)))) return MSVCRT_EOF; } retval = MSVCRT_fwrite(mem, sizeof(*mem), written, file); diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b6497b4..c70b6f7 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -106,7 +106,7 @@ static char* msvcrt_argvtos(const char* const* arg, char delim) a++; }
- ret = (char*)MSVCRT_malloc(size + 1); + ret = MSVCRT_malloc(size + 1); if (!ret) return NULL;
@@ -161,7 +161,7 @@ static char* msvcrt_valisttos(const char* arg0, va_list alist, char delim) arg = va_arg(alist, char*); } while (arg != NULL);
- ret = (char*)MSVCRT_malloc(size + 1); + ret = MSVCRT_malloc(size + 1); if (!ret) return NULL;
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a16d3d8..5d2b816 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -254,7 +254,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) else len++; } va_end(args); - if (!(tmp = (char*)und_alloc(sym, len))) return NULL; + if (!(tmp = und_alloc(sym, len))) return NULL; va_start(args, format); for (p = tmp, i = 0; format[i]; i++) {