Author: diego Date: Thu Nov 9 00:31:33 2006 New Revision: 20806 Modified: trunk/libdvdread/libdvdread_changes.diff Log: Update for malloc cast changes. Modified: trunk/libdvdread/libdvdread_changes.diff ============================================================================== --- trunk/libdvdread/libdvdread_changes.diff (original) +++ trunk/libdvdread/libdvdread_changes.diff Thu Nov 9 00:31:33 2006 @@ -332,7 +332,79 @@ diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c --- dvdread.orig/ifo_read.c 30 Jun 2005 22:48:26 -0000 1.4 +++ dvdread/ifo_read.c 3 Oct 2005 14:29:01 -0000 1.5 -@@ -638,10 +638,6 @@ +@@ -97,7 +101,7 @@ + ifo_handle_t *ifoOpen(dvd_reader_t *dvd, int title) { + ifo_handle_t *ifofile; + +- ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); ++ ifofile = malloc(sizeof(ifo_handle_t)); + if(!ifofile) + return 0; + +@@ -182,7 +186,7 @@ + ifo_handle_t *ifoOpenVMGI(dvd_reader_t *dvd) { + ifo_handle_t *ifofile; + +- ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); ++ ifofile = malloc(sizeof(ifo_handle_t)); + if(!ifofile) + return 0; + +@@ -209,7 +213,7 @@ + ifo_handle_t *ifoOpenVTSI(dvd_reader_t *dvd, int title) { + ifo_handle_t *ifofile; + +- ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); ++ ifofile = malloc(sizeof(ifo_handle_t)); + if(!ifofile) + return 0; + +@@ -274,7 +278,7 @@ + static int ifoRead_VMG(ifo_handle_t *ifofile) { + vmgi_mat_t *vmgi_mat; + +- vmgi_mat = (vmgi_mat_t *)malloc(sizeof(vmgi_mat_t)); ++ vmgi_mat = malloc(sizeof(vmgi_mat_t)); + if(!vmgi_mat) + return 0; + +@@ -365,7 +369,7 @@ + vtsi_mat_t *vtsi_mat; + int i; + +- vtsi_mat = (vtsi_mat_t *)malloc(sizeof(vtsi_mat_t)); ++ vtsi_mat = malloc(sizeof(vtsi_mat_t)); + if(!vtsi_mat) + return 0; + +@@ -493,7 +497,7 @@ + + if(cmd_tbl->nr_of_pre != 0) { + unsigned int pre_cmds_size = cmd_tbl->nr_of_pre * COMMAND_DATA_SIZE; +- cmd_tbl->pre_cmds = (vm_cmd_t *)malloc(pre_cmds_size); ++ cmd_tbl->pre_cmds = malloc(pre_cmds_size); + if(!cmd_tbl->pre_cmds) + return 0; + +@@ -505,7 +509,7 @@ + + if(cmd_tbl->nr_of_post != 0) { + unsigned int post_cmds_size = cmd_tbl->nr_of_post * COMMAND_DATA_SIZE; +- cmd_tbl->post_cmds = (vm_cmd_t *)malloc(post_cmds_size); ++ cmd_tbl->post_cmds = malloc(post_cmds_size); + if(!cmd_tbl->post_cmds) { + if(cmd_tbl->pre_cmds) + free(cmd_tbl->pre_cmds); +@@ -521,7 +525,7 @@ + + if(cmd_tbl->nr_of_cell != 0) { + unsigned int cell_cmds_size = cmd_tbl->nr_of_cell * COMMAND_DATA_SIZE; +- cmd_tbl->cell_cmds = (vm_cmd_t *)malloc(cell_cmds_size); ++ cmd_tbl->cell_cmds = malloc(cell_cmds_size); + if(!cmd_tbl->cell_cmds) { + if(cmd_tbl->pre_cmds) + free(cmd_tbl->pre_cmds); +@@ -638,10 +642,6 @@ B2N_16(pgc->cell_playback_offset); B2N_16(pgc->cell_position_offset); @@ -343,7 +415,7 @@ for(i = 0; i < 16; i++) B2N_32(pgc->palette[i]); -@@ -650,10 +646,10 @@ +@@ -650,10 +650,10 @@ /* verify time (look at print_time) */ for(i = 0; i < 8; i++) @@ -356,6 +428,231 @@ CHECK_ZERO(pgc->subp_control[i]); /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */ +@@ -752,7 +752,7 @@ + if(ifofile->vmgi_mat->first_play_pgc == 0) + return 1; + +- ifofile->first_play_pgc = (pgc_t *)malloc(sizeof(pgc_t)); ++ ifofile->first_play_pgc = malloc(sizeof(pgc_t)); + if(!ifofile->first_play_pgc) + return 0; + +@@ -806,7 +806,7 @@ + if(!DVDFileSeek_(ifofile->file, ifofile->vmgi_mat->tt_srpt * DVD_BLOCK_LEN)) + return 0; + +- tt_srpt = (tt_srpt_t *)malloc(sizeof(tt_srpt_t)); ++ tt_srpt = malloc(sizeof(tt_srpt_t)); + if(!tt_srpt) + return 0; + +@@ -823,7 +823,7 @@ + + info_length = tt_srpt->last_byte + 1 - TT_SRPT_SIZE; + +- tt_srpt->title = (title_info_t *)malloc(info_length); ++ tt_srpt->title = malloc(info_length); + if(!tt_srpt->title) { + free(tt_srpt); + ifofile->tt_srpt = 0; +@@ -908,7 +908,7 @@ + ifofile->vtsi_mat->vts_ptt_srpt * DVD_BLOCK_LEN)) + return 0; + +- vts_ptt_srpt = (vts_ptt_srpt_t *)malloc(sizeof(vts_ptt_srpt_t)); ++ vts_ptt_srpt = malloc(sizeof(vts_ptt_srpt_t)); + if(!vts_ptt_srpt) + return 0; + +@@ -929,7 +929,7 @@ + + info_length = vts_ptt_srpt->last_byte + 1 - VTS_PTT_SRPT_SIZE; + +- data = (uint32_t *)malloc(info_length); ++ data = malloc(info_length); + if(!data) { + free(vts_ptt_srpt); + ifofile->vts_ptt_srpt = 0; +@@ -1047,7 +1047,7 @@ + if(!DVDFileSeek_(ifofile->file, ifofile->vmgi_mat->ptl_mait * DVD_BLOCK_LEN)) + return 0; + +- ptl_mait = (ptl_mait_t *)malloc(sizeof(ptl_mait_t)); ++ ptl_mait = malloc(sizeof(ptl_mait_t)); + if(!ptl_mait) + return 0; + +@@ -1071,7 +1071,7 @@ + <= ptl_mait->last_byte + 1 - PTL_MAIT_SIZE); + + info_length = ptl_mait->nr_of_countries * sizeof(ptl_mait_country_t); +- ptl_mait->countries = (ptl_mait_country_t *)malloc(info_length); ++ ptl_mait->countries = malloc(info_length); + if(!ptl_mait->countries) { + free(ptl_mait); + ifofile->ptl_mait = 0; +@@ -1112,7 +1112,7 @@ + return 0; + } + info_length = (ptl_mait->nr_of_vtss + 1) * sizeof(pf_level_t); +- pf_temp = (uint16_t *)malloc(info_length); ++ pf_temp = malloc(info_length); + if(!pf_temp) { + for(j = 0; j < i ; j++) { + free(ptl_mait->countries[j].pf_ptl_mai); +@@ -1134,7 +1134,7 @@ + for (j = 0; j < ((ptl_mait->nr_of_vtss + 1) * 8); j++) { + B2N_16(pf_temp[j]); + } +- ptl_mait->countries[i].pf_ptl_mai = (pf_level_t *)malloc(info_length); ++ ptl_mait->countries[i].pf_ptl_mai = malloc(info_length); + if(!ptl_mait->countries[i].pf_ptl_mai) { + free(pf_temp); + for(j = 0; j < i ; j++) { +@@ -1198,7 +1198,7 @@ + if(!DVDFileSeek_(ifofile->file, offset)) + return 0; + +- vts_tmapt = (vts_tmapt_t *)malloc(sizeof(vts_tmapt_t)); ++ vts_tmapt = malloc(sizeof(vts_tmapt_t)); + if(!vts_tmapt) + return 0; + +@@ -1218,7 +1218,7 @@ + + info_length = vts_tmapt->nr_of_tmaps * 4; + +- vts_tmap_srp = (uint32_t *)malloc(info_length); ++ vts_tmap_srp = malloc(info_length); + if(!vts_tmap_srp) { + free(vts_tmapt); + ifofile->vts_tmapt = NULL; +@@ -1242,7 +1242,7 @@ + + info_length = vts_tmapt->nr_of_tmaps * sizeof(vts_tmap_t); + +- vts_tmapt->tmap = (vts_tmap_t *)malloc(info_length); ++ vts_tmapt->tmap = malloc(info_length); + if(!vts_tmapt->tmap) { + free(vts_tmap_srp); + free(vts_tmapt); +@@ -1274,7 +1274,7 @@ + + info_length = vts_tmapt->tmap[i].nr_of_entries * sizeof(map_ent_t); + +- vts_tmapt->tmap[i].map_ent = (map_ent_t *)malloc(info_length); ++ vts_tmapt->tmap[i].map_ent = malloc(info_length); + if(!vts_tmapt->tmap[i].map_ent) { + ifoFree_VTS_TMAPT(ifofile); + return 0; +@@ -1322,7 +1322,7 @@ + if(ifofile->vtsi_mat->vts_c_adt == 0) /* mandatory */ + return 0; + +- ifofile->vts_c_adt = (c_adt_t *)malloc(sizeof(c_adt_t)); ++ ifofile->vts_c_adt = malloc(sizeof(c_adt_t)); + if(!ifofile->vts_c_adt) + return 0; + +@@ -1354,7 +1354,7 @@ + return 0; + } + +- ifofile->menu_c_adt = (c_adt_t *)malloc(sizeof(c_adt_t)); ++ ifofile->menu_c_adt = malloc(sizeof(c_adt_t)); + if(!ifofile->menu_c_adt) + return 0; + +@@ -1396,7 +1396,7 @@ + c_adt->nr_of_vobs = info_length / sizeof(cell_adr_t); + } + +- c_adt->cell_adr_table = (cell_adr_t *)malloc(info_length); ++ c_adt->cell_adr_table = malloc(info_length); + if(!c_adt->cell_adr_table) + return 0; + +@@ -1456,7 +1456,7 @@ + if(ifofile->vtsi_mat->vts_vobu_admap == 0) /* mandatory */ + return 0; + +- ifofile->vts_vobu_admap = (vobu_admap_t *)malloc(sizeof(vobu_admap_t)); ++ ifofile->vts_vobu_admap = malloc(sizeof(vobu_admap_t)); + if(!ifofile->vts_vobu_admap) + return 0; + +@@ -1488,7 +1488,7 @@ + return 0; + } + +- ifofile->menu_vobu_admap = (vobu_admap_t *)malloc(sizeof(vobu_admap_t)); ++ ifofile->menu_vobu_admap = malloc(sizeof(vobu_admap_t)); + if(!ifofile->menu_vobu_admap) + return 0; + +@@ -1521,7 +1521,7 @@ + Titles with a VOBS that has no VOBUs. */ + CHECK_VALUE(info_length % sizeof(uint32_t) == 0); + +- vobu_admap->vobu_start_sectors = (uint32_t *)malloc(info_length); ++ vobu_admap->vobu_start_sectors = malloc(info_length); + if(!vobu_admap->vobu_start_sectors) { + return 0; + } +@@ -1573,7 +1573,7 @@ + if(ifofile->vtsi_mat->vts_pgcit == 0) /* mandatory */ + return 0; + +- ifofile->vts_pgcit = (pgcit_t *)malloc(sizeof(pgcit_t)); ++ ifofile->vts_pgcit = malloc(sizeof(pgcit_t)); + if(!ifofile->vts_pgcit) + return 0; + +@@ -1703,7 +1703,7 @@ + return 0; + } + +- ifofile->pgci_ut = (pgci_ut_t *)malloc(sizeof(pgci_ut_t)); ++ ifofile->pgci_ut = malloc(sizeof(pgci_ut_t)); + if(!ifofile->pgci_ut) + return 0; + +@@ -1893,7 +1893,7 @@ + if(!DVDFileSeek_(ifofile->file, sector * DVD_BLOCK_LEN)) + return 0; + +- vts_atrt = (vts_atrt_t *)malloc(sizeof(vts_atrt_t)); ++ vts_atrt = malloc(sizeof(vts_atrt_t)); + if(!vts_atrt) + return 0; + +@@ -1915,7 +1915,7 @@ + VTS_ATRT_SIZE < vts_atrt->last_byte + 1); + + info_length = vts_atrt->nr_of_vtss * sizeof(uint32_t); +- data = (uint32_t *)malloc(info_length); ++ data = malloc(info_length); + if(!data) { + free(vts_atrt); + ifofile->vts_atrt = 0; +@@ -1937,7 +1937,7 @@ + } + + info_length = vts_atrt->nr_of_vtss * sizeof(vts_attributes_t); +- vts_atrt->vts = (vts_attributes_t *)malloc(info_length); ++ vts_atrt->vts = malloc(info_length); + if(!vts_atrt->vts) { + free(data); + free(vts_atrt); +@@ -1993,7 +1993,7 @@ + ifofile->vmgi_mat->txtdt_mgi * DVD_BLOCK_LEN)) + return 0; + +- txtdt_mgi = (txtdt_mgi_t *)malloc(sizeof(txtdt_mgi_t)); ++ txtdt_mgi = malloc(sizeof(txtdt_mgi_t)); + if(!txtdt_mgi) { + return 0; + } diff -Naur dvdread.orig/ifo_read.h dvdread/ifo_read.h --- dvdread.orig/ifo_read.h 2005-06-23 00:18:54.000000000 +0200