RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-07 15:41:55 +00:00
Code Issues Releases Wiki Activity

Do not cast calloc/malloc results

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19612 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-08-31 18:43:41 +00:00
parent 490175e71b
commit ecb187ef22
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stream/stream_radio.c
View File

@ -178,7 +178,7 @@ static int parse_channels(radio_priv_t* priv,float freq_channel,float* pfreq){
channels =radio_param_channels; channels =radio_param_channels;
mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_ChannelNamesDetected); mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_ChannelNamesDetected);
priv->radio_channel_list = (radio_channels_t*)malloc(sizeof(radio_channels_t)); priv->radio_channel_list = malloc(sizeof(radio_channels_t));
priv->radio_channel_list->index=1; priv->radio_channel_list->index=1;
priv->radio_channel_list->next=NULL; priv->radio_channel_list->next=NULL;
priv->radio_channel_list->prev=NULL; priv->radio_channel_list->prev=NULL;
@ -200,7 +200,7 @@ static int parse_channels(radio_priv_t* priv,float freq_channel,float* pfreq){
while ((sep=strchr(priv->radio_channel_current->name, '_'))) sep[0] = ' '; while ((sep=strchr(priv->radio_channel_current->name, '_'))) sep[0] = ' ';
priv->radio_channel_current->next = (radio_channels_t*)malloc(sizeof(radio_channels_t)); priv->radio_channel_current->next = malloc(sizeof(radio_channels_t));
priv->radio_channel_current->next->index = priv->radio_channel_current->index + 1; priv->radio_channel_current->next->index = priv->radio_channel_current->index + 1;
priv->radio_channel_current->next->prev = priv->radio_channel_current; priv->radio_channel_current->next->prev = priv->radio_channel_current;
priv->radio_channel_current->next->next = NULL; priv->radio_channel_current->next->next = NULL;
@ -232,7 +232,7 @@ static int parse_channels(radio_priv_t* priv,float freq_channel,float* pfreq){
}else{ }else{
if (freq_channel){ if (freq_channel){
mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_FreqParameterDetected); mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_FreqParameterDetected);
priv->radio_channel_list=(radio_channels_t*)malloc(sizeof(radio_channels_t)); priv->radio_channel_list=malloc(sizeof(radio_channels_t));
priv->radio_channel_list->next=NULL; priv->radio_channel_list->next=NULL;
priv->radio_channel_list->prev=NULL; priv->radio_channel_list->prev=NULL;
priv->radio_channel_list->index=1; priv->radio_channel_list->index=1;
@ -779,7 +779,7 @@ static int init_audio(radio_priv_t *priv)
mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_AudioBuffer, mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_AudioBuffer,
priv->audio_buffer_size,priv->audio_in.blocksize); priv->audio_buffer_size,priv->audio_in.blocksize);
/* start capture */ /* start capture */
priv->audio_ringbuffer = (unsigned char*)calloc(1, priv->audio_buffer_size); priv->audio_ringbuffer = calloc(1, priv->audio_buffer_size);
if (!priv->audio_ringbuffer) { if (!priv->audio_ringbuffer) {
mp_msg(MSGT_RADIO, MSGL_ERR, MSGTR_RADIO_AllocateBufferFailed,priv->audio_in.blocksize, priv->audio_buffer_size, strerror(errno)); mp_msg(MSGT_RADIO, MSGL_ERR, MSGTR_RADIO_AllocateBufferFailed,priv->audio_in.blocksize, priv->audio_buffer_size, strerror(errno));
return STREAM_ERROR; return STREAM_ERROR;
@ -941,7 +941,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
if(mode != STREAM_READ) if(mode != STREAM_READ)
return STREAM_UNSUPORTED; return STREAM_UNSUPORTED;
priv=(radio_priv_t*)malloc(sizeof(radio_priv_t)); priv=malloc(sizeof(radio_priv_t));
if (!priv) if (!priv)
return STREAM_ERROR; return STREAM_ERROR;