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

Made use of isoburn_preset_msgs_submit()

Browse Source
This commit is contained in:
Thomas Schmitt 2008-06-18 16:16:49 +00:00
parent ae5ad5a143
commit 4de452fb94
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xorriso/xorriso.c
View File

@ -5452,6 +5452,7 @@ int Xorriso_process_errfile(struct XorrisO *xorriso,
3="libisoburn" 3="libisoburn"
else: "" else: ""
bit6= append carriage return rather than line feed (if not os_errno) bit6= append carriage return rather than line feed (if not os_errno)
bit7= perform Xorriso_process_msg_queues() first
*/ */
int Xorriso_msgs_submit(struct XorrisO *xorriso, int Xorriso_msgs_submit(struct XorrisO *xorriso,
int error_code, char msg_text[], int os_errno, int error_code, char msg_text[], int os_errno,
@ -5463,6 +5464,9 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
"xorriso : ", "libisofs: ", "libburn : ", "libisoburn: ", "xorriso : ", "libisofs: ", "libburn : ", "libisoburn: ",
"", "", "", "", "", "", "", "", "", "", "", "" }; "", "", "", "", "", "", "", "", "", "", "", "" };
if(flag&128)
Xorriso_process_msg_queues(xorriso, 0);
if(strcmp(severity, "ERRFILE")==0) if(strcmp(severity, "ERRFILE")==0)
Xorriso_process_errfile(xorriso, error_code, msg_text, os_errno, 0); Xorriso_process_errfile(xorriso, error_code, msg_text, os_errno, 0);
@ -5513,6 +5517,20 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
} }
/* To be used with isoburn_set_msgs_submit()
*/
int Xorriso_msgs_submit_void(void *xorriso,
int error_code, char msg_text[], int os_errno,
char severity[], int flag)
{
int ret;
ret= Xorriso_msgs_submit((struct XorrisO *) xorriso, error_code, msg_text,
os_errno, severity, flag);
return(ret);
}
/** /**
@param flag bit0= do not issue own event messages @param flag bit0= do not issue own event messages
bit1= take xorriso->request_to_abort as reason for abort bit1= take xorriso->request_to_abort as reason for abort

7
xorriso/xorriso.h
View File

@ -72,6 +72,13 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
int error_code, char msg_text[], int os_errno, int error_code, char msg_text[], int os_errno,
char severity[], int flag); char severity[], int flag);
/** Alternative call interface of Xorriso_msgs_submit with void* instead
of struct XorrisO*
*/
int Xorriso_msgs_submit_void(void *xorriso,
int error_code, char msg_text[], int os_errno,
char severity[], int flag);
/** Evaluate an advise whether to abort or whether to go on with option /** Evaluate an advise whether to abort or whether to go on with option
processing. This should be called after any option function was processed. processing. This should be called after any option function was processed.

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.06.18.161512" #define Xorriso_timestamP "2008.06.18.161723"

2
xorriso/xorrisoburn.c
View File

@ -466,6 +466,8 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
} }
if(dinfo==NULL) { if(dinfo==NULL) {
isoburn_preset_msgs_submit(Xorriso_msgs_submit_void, (void *) xorriso,
(3<<2) | 128 , 0);
aquire_flag= 1 | ((flag&(8|4))>>1) | ((xorriso->toc_emulation_flag&1)<<3); aquire_flag= 1 | ((flag&(8|4))>>1) | ((xorriso->toc_emulation_flag&1)<<3);
ret= isoburn_drive_aquire(&dinfo, libburn_adr, aquire_flag); ret= isoburn_drive_aquire(&dinfo, libburn_adr, aquire_flag);
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);