From 32492483c0783a7b82a45a400527977124575335 Mon Sep 17 00:00:00 2001 From: reynaldo Date: Thu, 13 Jul 2006 16:41:13 +0000 Subject: drops casts from void * on malloc/calloc from libmpdemux code git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19067 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/cddb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libmpdemux/cddb.c') diff --git a/libmpdemux/cddb.c b/libmpdemux/cddb.c index a43db97218..2bc127029e 100644 --- a/libmpdemux/cddb.c +++ b/libmpdemux/cddb.c @@ -349,7 +349,7 @@ cddb_read_cache(cddb_data_t *cddb_data) { file_size = stats.st_size; } - cddb_data->xmcd_file = (char*)malloc(file_size); + cddb_data->xmcd_file = malloc(file_size); if( cddb_data->xmcd_file==NULL ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed); close(file_fd); @@ -741,7 +741,7 @@ cddb_resolve(const char *dev, char **xmcd_file) { if( home_dir==NULL ) { cddb_data.cache_dir = NULL; } else { - cddb_data.cache_dir = (char*)malloc(strlen(home_dir)+strlen(cddb_cache_dir)+1); + cddb_data.cache_dir = malloc(strlen(home_dir)+strlen(cddb_cache_dir)+1); if( cddb_data.cache_dir==NULL ) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed); return -1; @@ -779,14 +779,14 @@ xmcd_parse_dtitle(cd_info_t *cd_info, char *line) { ptr += 7; album = strstr(ptr, "/"); if( album==NULL ) return NULL; - cd_info->album = (char*)malloc(strlen(album+2)+1); + cd_info->album = malloc(strlen(album+2)+1); if( cd_info->album==NULL ) { return NULL; } strcpy( cd_info->album, album+2 ); album--; album[0] = '\0'; - cd_info->artist = (char*)malloc(strlen(ptr)+1); + cd_info->artist = malloc(strlen(ptr)+1); if( cd_info->artist==NULL ) { return NULL; } @@ -801,7 +801,7 @@ xmcd_parse_dgenre(cd_info_t *cd_info, char *line) { ptr = strstr(line, "DGENRE="); if( ptr!=NULL ) { ptr += 7; - cd_info->genre = (char*)malloc(strlen(ptr)+1); + cd_info->genre = malloc(strlen(ptr)+1); if( cd_info->genre==NULL ) { return NULL; } -- cgit v1.2.3