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

Adapted to libisofs revision 337

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-06 18:35:11 +00:00
parent f7dcc55a06
commit 514dfb3433
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,12 +731,9 @@ int isoburn_report_iso_error(int iso_error_code, char msg_text[], int os_errno,
int error_code, iso_sev, min_sev, ret;
char *sev_text_pt, *msg_text_pt= NULL;
error_code= 0x00050000;
/* It would have been neat ...
#define ISO_ERR_CODE(e) (e & 0x0000FFFF)
error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code);
*/
error_code= iso_error_get_code(iso_error_code);
if(error_code < 0x00030000 || error_code >= 0x0004000)
error_code= (error_code & 0xffff) | 0x00050000;
if(iso_error_code<0)
msg_text_pt= (char *) iso_error_to_msg(iso_error_code);

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

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.06.153709"
#define Xorriso_timestamP "2008.02.06.183423"

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

@ -299,12 +299,9 @@ int Xorriso_report_iso_error(struct XorrisO *xorriso, char *victim,
char *sev_text_pt, *msg_text_pt= NULL;
char sfe[6*SfileadrL];
error_code= 0x00050000;
/* It would have been neat ...
#define ISO_ERR_CODE(e) (e & 0x0000FFFF)
error_code= 0x00050000 | ISO_ERR_CODE(iso_error_code);
*/
error_code= iso_error_get_code(iso_error_code);
if(error_code < 0x00030000 || error_code >= 0x0004000)
error_code= (error_code & 0xffff) | 0x00050000;
if(flag&1)
msg_text_pt= (char *) iso_error_to_msg(iso_error_code);
@ -321,7 +318,7 @@ int Xorriso_report_iso_error(struct XorrisO *xorriso, char *victim,
strcat(sfe, ": ");
Text_shellsafe(victim, sfe+strlen(sfe), 0);
}
ret= Xorriso_msgs_submit(xorriso, error_code, sfe, os_errno, sev_text_pt, 0);
ret= Xorriso_msgs_submit(xorriso, error_code, sfe, os_errno, sev_text_pt, 4);
return(ret);
}
@ -1604,7 +1601,8 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
else {
ret= burn_msgs_obtain("ALL", &error_code, xorriso->info_text, &os_errno,
severity);
if(error_code>=0x00050000 && error_code<0x00060000)
if((error_code>=0x00030000 && error_code<0x00040000) ||
(error_code>=0x00050000 && error_code<0x00060000))
tunneled= -1; /* "libisofs:" */
if(error_code>=0x00060000 && error_code<0x00070000)
tunneled= 1; /* "libisoburn:" */