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

Clarified code path ifndef Xorriso_with_libjtE. Coverity CID 28703.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-11-08 16:17:25 +00:00
parent a23bd24945
commit 185dc4ce42
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xorriso/lib_mgt.c
View File

@ -539,8 +539,8 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
while(1) { while(1) {
tunneled= 0; tunneled= 0;
if(pass==0) { if(pass==0) {
ret= 0;
#ifdef Xorriso_with_libjtE #ifdef Xorriso_with_libjtE
ret= 0;
if(xorriso->libjte_handle != NULL) { if(xorriso->libjte_handle != NULL) {
msg= libjte_get_next_message(xorriso->libjte_handle); msg= libjte_get_next_message(xorriso->libjte_handle);
if(msg != NULL) { if(msg != NULL) {
@ -552,7 +552,9 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
ret= 1; ret= 1;
} }
} }
#endif /* Xorriso_with_libjtE */ #else
break;
#endif /* ! Xorriso_with_libjtE */
} else if(pass==1) } else if(pass==1)
ret= iso_obtain_msgs("ALL", &error_code, &imgid, text, severity); ret= iso_obtain_msgs("ALL", &error_code, &imgid, text, severity);
@ -576,10 +578,14 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
else if(error_code==0x51001) else if(error_code==0x51001)
strcpy(severity, "ERRFILE"); strcpy(severity, "ERRFILE");
#ifdef Xorriso_with_libjtE
if(pass == 0) if(pass == 0)
name_prefix_code= 0; name_prefix_code= 0;
else else
name_prefix_code= pass + tunneled; name_prefix_code= pass + tunneled;
#else
name_prefix_code= pass + tunneled;
#endif /* Xorriso_with_libjtE */
Xorriso_msgs_submit(xorriso, error_code, text, os_errno, Xorriso_msgs_submit(xorriso, error_code, text, os_errno,
severity, name_prefix_code << 2); severity, name_prefix_code << 2);
count++; count++;

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.11.08.143244" #define Xorriso_timestamP "2015.11.08.161658"