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

Adapted to libisofs revision 332

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-04 09:32:02 +00:00
parent 36430e6e15
commit ce082db6d2
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisoburn/trunk/libisoburn/burn_wrap.c
View File

@ -701,12 +701,16 @@ int isoburn_report_iso_error(int iso_error_code, char msg_text[], int os_errno,
int error_code, iso_sev, min_sev, ret; int error_code, iso_sev, min_sev, ret;
char *sev_text_pt, *msg_text_pt= NULL; char *sev_text_pt, *msg_text_pt= NULL;
/* <<< delete as soon as replacement appears in libisofs */
#define ISO_ERR_CODE(e) (e & 0x0000FFFF)
error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code); error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code);
if(iso_error_code<0) if(iso_error_code<0)
msg_text_pt= (char *) iso_error_to_msg(iso_error_code); msg_text_pt= (char *) iso_error_to_msg(iso_error_code);
if(msg_text_pt==NULL) if(msg_text_pt==NULL)
msg_text_pt= msg_text; msg_text_pt= msg_text;
iso_sev= ISO_ERR_SEV(iso_error_code); iso_sev= iso_error_get_severity(iso_error_code);
sev_text_pt= min_severity; sev_text_pt= min_severity;
burn_text_to_sev(min_severity, &min_sev, 0); burn_text_to_sev(min_severity, &min_sev, 0);
if(min_sev < iso_sev) if(min_sev < iso_sev)

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.03.181259" #define Xorriso_timestamP "2008.02.04.093106"

5
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -298,12 +298,15 @@ int Xorriso_report_iso_error(struct XorrisO *xorriso,
int error_code, iso_sev, min_sev, ret; int error_code, iso_sev, min_sev, ret;
char *sev_text_pt, *msg_text_pt= NULL; char *sev_text_pt, *msg_text_pt= NULL;
/* <<< delete as soon as replacement appears in libisofs */
#define ISO_ERR_CODE(e) (e & 0x0000FFFF)
error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code); error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code);
if(flag&1) if(flag&1)
msg_text_pt= (char *) iso_error_to_msg(iso_error_code); msg_text_pt= (char *) iso_error_to_msg(iso_error_code);
if(msg_text_pt==NULL) if(msg_text_pt==NULL)
msg_text_pt= msg_text; msg_text_pt= msg_text;
iso_sev= ISO_ERR_SEV(iso_error_code); iso_sev= iso_error_get_severity(iso_error_code);
sev_text_pt= min_severity; sev_text_pt= min_severity;
burn_text_to_sev(min_severity, &min_sev, 0); burn_text_to_sev(min_severity, &min_sev, 0);
if(min_sev < iso_sev) if(min_sev < iso_sev)