diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c index 7b471272..5e019d08 100644 --- a/libisoburn/burn_wrap.c +++ b/libisoburn/burn_wrap.c @@ -2042,8 +2042,8 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *d) } -int isoburn_get_track_lba_v2(struct isoburn_toc_track *track, off_t *lba, - int flag) +int isoburn_get_track_lba(struct isoburn_toc_track *track, off_t *lba, + int flag) { struct burn_toc_entry entry; @@ -2059,23 +2059,6 @@ int isoburn_get_track_lba_v2(struct isoburn_toc_track *track, off_t *lba, } -int isoburn_get_track_lba(struct isoburn_toc_track *track, int *lba, int flag) -{ - off_t long_lba; - int ret; - - ret= isoburn_get_track_lba_v2(track, &long_lba, flag); - if(ret <= 0) - return(ret); - if(long_lba > 0x7fffffff) { - *lba= 0x7fffffff; - return(0); - } - *lba= long_lba; - return(ret); -} - - int isoburn_drive_set_msgs_submit(struct burn_drive *d, int (*msgs_submit)(void *handle, int error_code, char msg_text[], int os_errno, @@ -2155,7 +2138,7 @@ not_found:; &num_tracks); if(tracks==NULL || num_tracks<=0) goto not_found; - isoburn_get_track_lba_v2(tracks[0], &(o->fabricated_msc1), 0); + isoburn_get_track_lba(tracks[0], &(o->fabricated_msc1), 0); } else if(adr_mode==1) { /* Use adr_num as session index (first session is 1, not 0) */ @@ -2164,7 +2147,7 @@ not_found:; tracks= isoburn_toc_session_get_tracks(sessions[adr_num-1], &num_tracks); if(tracks==NULL || num_tracks<=0) goto not_found; - isoburn_get_track_lba_v2(tracks[0], &(o->fabricated_msc1), 0); + isoburn_get_track_lba(tracks[0], &(o->fabricated_msc1), 0); } else if(adr_mode==2) { /* use adr_num as track index */ @@ -2176,7 +2159,7 @@ not_found:; for(j= 0; jfabricated_msc1), 0); + isoburn_get_track_lba(tracks[j], &(o->fabricated_msc1), 0); ret= 1; goto ex; } } @@ -2228,7 +2211,7 @@ not_found:; if(ret < 0) continue; if(ret == 0) { - isoburn_get_track_lba_v2(tracks[0], &lba, 0); + isoburn_get_track_lba(tracks[0], &lba, 0); ret= isoburn_read_iso_head_v2(d, lba, &size, volid, 1); if(ret<=0) continue; @@ -2309,7 +2292,7 @@ int isoburn_get_mount_params_v2(struct burn_drive *d, continue; for(j= 0; j