libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced non-API isoburn_get_track_lba() by isoburn_get_track_lba_v2()

Browse Source
This commit is contained in:
Thomas Schmitt 2024-03-10 12:30:44 +01:00
parent bae9516439
commit a07addd083
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libisoburn/burn_wrap.c
View File

@ -2042,7 +2042,7 @@ 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 isoburn_get_track_lba(struct isoburn_toc_track *track, off_t *lba,
int flag) int flag)
{ {
struct burn_toc_entry entry; 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 isoburn_drive_set_msgs_submit(struct burn_drive *d,
int (*msgs_submit)(void *handle, int error_code, int (*msgs_submit)(void *handle, int error_code,
char msg_text[], int os_errno, char msg_text[], int os_errno,
@ -2155,7 +2138,7 @@ not_found:;
&num_tracks); &num_tracks);
if(tracks==NULL || num_tracks<=0) if(tracks==NULL || num_tracks<=0)
goto not_found; 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) { } else if(adr_mode==1) {
/* Use adr_num as session index (first session is 1, not 0) */ /* 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); tracks= isoburn_toc_session_get_tracks(sessions[adr_num-1], &num_tracks);
if(tracks==NULL || num_tracks<=0) if(tracks==NULL || num_tracks<=0)
goto not_found; 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) { } else if(adr_mode==2) {
/* use adr_num as track index */ /* use adr_num as track index */
@ -2176,7 +2159,7 @@ not_found:;
for(j= 0; j<num_tracks; j++) { for(j= 0; j<num_tracks; j++) {
total_tracks++; total_tracks++;
if(total_tracks==adr_num) { if(total_tracks==adr_num) {
isoburn_get_track_lba_v2(tracks[j], &(o->fabricated_msc1), 0); isoburn_get_track_lba(tracks[j], &(o->fabricated_msc1), 0);
ret= 1; goto ex; ret= 1; goto ex;
} }
} }
@ -2228,7 +2211,7 @@ not_found:;
if(ret < 0) if(ret < 0)
continue; continue;
if(ret == 0) { 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); ret= isoburn_read_iso_head_v2(d, lba, &size, volid, 1);
if(ret<=0) if(ret<=0)
continue; continue;
@ -2309,7 +2292,7 @@ int isoburn_get_mount_params_v2(struct burn_drive *d,
continue; continue;
for(j= 0; j<num_tracks && *track < 0; j++) { for(j= 0; j<num_tracks && *track < 0; j++) {
total_tracks++; total_tracks++;
isoburn_get_track_lba_v2(tracks[j], &track_lba, 0); isoburn_get_track_lba(tracks[j], &track_lba, 0);
if(track_lba == *lba) { if(track_lba == *lba) {
*track= total_tracks; *track= total_tracks;
*session= i + 1; *session= i + 1;

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2024.03.10.112148" #define Xorriso_timestamP "2024.03.10.113018"