summaryrefslogtreecommitdiffstats
path: root/loader/win32.c
diff options
context:
space:
mode:
authorreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-02 03:59:36 +0000
committerreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-02 03:59:36 +0000
commit9d9a15d18572d1450fd8fef495be3629bf85c995 (patch)
treebfbc498db3d3ada10c8cfe64c9381bce66533419 /loader/win32.c
parent1ad9af38b5120af85129d3b74834c7ed9690e7f3 (diff)
downloadmpv-9d9a15d18572d1450fd8fef495be3629bf85c995.tar.bz2
mpv-9d9a15d18572d1450fd8fef495be3629bf85c995.tar.xz
rm unnecesary casts from void* - part 2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18883 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/win32.c')
-rw-r--r--loader/win32.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/loader/win32.c b/loader/win32.c
index 74a9031bc5..feea09ba67 100644
--- a/loader/win32.c
+++ b/loader/win32.c
@@ -2759,7 +2759,7 @@ static int WINAPI expGetPrivateProfileIntA(const char* appname,
dbgprintf("GetPrivateProfileIntA('%s', '%s', %d, '%s') => %d\n", appname, keyname, default_value, filename, default_value );
return default_value;
}
- fullname=(char*)malloc(50+strlen(appname)+strlen(keyname)+strlen(filename));
+ fullname=malloc(50+strlen(appname)+strlen(keyname)+strlen(filename));
strcpy(fullname, "Software\\IniFileMapping\\");
strcat(fullname, appname);
strcat(fullname, "\\");
@@ -2797,7 +2797,7 @@ static int WINAPI expGetPrivateProfileStringA(const char* appname,
char* fullname;
dbgprintf("GetPrivateProfileStringA('%s', '%s', def_val '%s', 0x%x, 0x%x, '%s')", appname, keyname, def_val, dest, len, filename );
if(!(appname && keyname && filename) ) return 0;
- fullname=(char*)malloc(50+strlen(appname)+strlen(keyname)+strlen(filename));
+ fullname=malloc(50+strlen(appname)+strlen(keyname)+strlen(filename));
strcpy(fullname, "Software\\IniFileMapping\\");
strcat(fullname, appname);
strcat(fullname, "\\");
@@ -2828,7 +2828,7 @@ static int WINAPI expWritePrivateProfileStringA(const char* appname,
dbgprintf(" => -1\n");
return -1;
}
- fullname=(char*)malloc(50+strlen(appname)+strlen(keyname)+strlen(filename));
+ fullname=malloc(50+strlen(appname)+strlen(keyname)+strlen(filename));
strcpy(fullname, "Software\\IniFileMapping\\");
strcat(fullname, appname);
strcat(fullname, "\\");
@@ -3542,7 +3542,7 @@ static HANDLE WINAPI expCreateFileA(LPCSTR cs1,DWORD i1,DWORD i2,
if(strstr(cs1, "QuickTime.qts"))
{
int result;
- char* tmp=(char*)malloc(strlen(def_path)+50);
+ char* tmp=malloc(strlen(def_path)+50);
strcpy(tmp, def_path);
strcat(tmp, "/");
strcat(tmp, "QuickTime.qts");
@@ -3553,7 +3553,7 @@ static HANDLE WINAPI expCreateFileA(LPCSTR cs1,DWORD i1,DWORD i2,
if(strstr(cs1, ".qtx"))
{
int result;
- char* tmp=(char*)malloc(strlen(def_path)+250);
+ char* tmp=malloc(strlen(def_path)+250);
char* x=strrchr(cs1,'\\');
sprintf(tmp,"%s/%s",def_path,x?(x+1):cs1);
// printf("### Open: %s -> %s\n",cs1,tmp);
@@ -3566,7 +3566,7 @@ static HANDLE WINAPI expCreateFileA(LPCSTR cs1,DWORD i1,DWORD i2,
if(strncmp(cs1, "AP", 2) == 0)
{
int result;
- char* tmp=(char*)malloc(strlen(def_path)+50);
+ char* tmp=malloc(strlen(def_path)+50);
strcpy(tmp, def_path);
strcat(tmp, "/");
strcat(tmp, "APmpg4v1.apl");
@@ -3578,7 +3578,7 @@ static HANDLE WINAPI expCreateFileA(LPCSTR cs1,DWORD i1,DWORD i2,
{
int r;
int flg = 0;
- char* tmp=(char*)malloc(20 + strlen(cs1));
+ char* tmp=malloc(20 + strlen(cs1));
strcpy(tmp, "/tmp/");
strcat(tmp, cs1);
r = 4;