/*
* Initialize structure with default values
*/
- p_vcddev = (vcddev_t *)malloc( sizeof(vcddev_t) );
+ p_vcddev = malloc( sizeof(*p_vcddev) );
if( p_vcddev == NULL )
return NULL;
p_vcddev->i_vcdimage_handle = -1;
if( pp_sectors )
{
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
return 0;
memcpy( *pp_sectors, p_vcddev->p_sectors,
- (i_tracks + 1) * sizeof(int) );
+ (i_tracks + 1) * sizeof(**pp_sectors) );
}
return i_tracks;
CDTOCDescriptor *pTrackDescriptors;
u_char track;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
{
darwin_freeTOC( pTOC );
((unsigned int)p_tocheader[1] << 8);
p_fulltoc = malloc( i_toclength );
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL || p_fulltoc == NULL )
{
{
int i;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
return 0;
{
int i;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
return 0;
{
int i;
- *pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
+ *pp_sectors = malloc( (i_tracks + 1) * sizeof(**pp_sectors) );
if( *pp_sectors == NULL )
return 0;
uint8_t *p_block;
int i;
- if( i_type == VCD_TYPE ) p_block = malloc( VCD_SECTOR_SIZE * i_nb );
- else p_block = p_buffer;
+ if( i_type == VCD_TYPE )
+ p_block = malloc( VCD_SECTOR_SIZE * i_nb );
+ else
+ p_block = p_buffer;
if( p_vcddev->i_vcdimage_handle != -1 )
{
p_sectors = buf;
p_sectors[i_tracks] = MSF_TO_LBA(i_min, i_sec, i_frame);
msg_Dbg( p_this, "vcd track %i begins at sector:%i",
- i_tracks, p_sectors[i_tracks] );
+ (int)i_tracks, (int)p_sectors[i_tracks] );
i_tracks++;
break;
}
p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END)
/ VCD_SECTOR_SIZE;
msg_Dbg( p_this, "vcd track %i, begins at sector:%i",
- i_tracks, p_sectors[i_tracks] );
+ (int)i_tracks, (int)p_sectors[i_tracks] );
p_vcddev->i_tracks = ++i_tracks;
p_vcddev->p_sectors = p_sectors;
i_ret = 0;
****************************************************************************/
static void CloseVCDImage( vlc_object_t * p_this, vcddev_t *p_vcddev )
{
+ VLC_UNUSED( p_this );
if( p_vcddev->i_vcdimage_handle != -1 )
close( p_vcddev->i_vcdimage_handle );
else
buf_len = CFDataGetLength( data ) + 1;
range = CFRangeMake( 0, buf_len );
- if( ( pTOC = (CDTOC *)malloc( buf_len ) ) != NULL )
+ if( ( pTOC = malloc( buf_len ) ) != NULL )
{
CFDataGetBytes( data, range, (u_char *)pTOC );
}