diff --git a/libisoburn/trunk/libisoburn/libisoburn.h b/libisoburn/trunk/libisoburn/libisoburn.h index 699d5c9c..8c78b09f 100644 --- a/libisoburn/trunk/libisoburn/libisoburn.h +++ b/libisoburn/trunk/libisoburn/libisoburn.h @@ -250,7 +250,7 @@ void isoburn_version(int *major, int *minor, int *micro); */ #define isoburn_libburn_req_major 1 #define isoburn_libburn_req_minor 2 -#define isoburn_libburn_req_micro 4 +#define isoburn_libburn_req_micro 5 /** The minimum compile time requirements of libisoburn towards libjte are the same as of a suitable libisofs towards libjte. diff --git a/libisoburn/trunk/libisoburn/libisoburn.ver b/libisoburn/trunk/libisoburn/libisoburn.ver index 9bca698d..a7a78345 100644 --- a/libisoburn/trunk/libisoburn/libisoburn.ver +++ b/libisoburn/trunk/libisoburn/libisoburn.ver @@ -119,6 +119,7 @@ Xorriso__get_patch_level_text; Xorriso__is_compatible; Xorriso__preset_signal_behavior; Xorriso__severity_cmp; +Xorriso__severity_list; Xorriso__version; Xorriso_change_is_pending; Xorriso_destroy; diff --git a/libisoburn/trunk/xorriso/lib_mgt.c b/libisoburn/trunk/xorriso/lib_mgt.c index fb8ecf88..570f0a29 100644 --- a/libisoburn/trunk/xorriso/lib_mgt.c +++ b/libisoburn/trunk/xorriso/lib_mgt.c @@ -352,12 +352,12 @@ int Xorriso__sev_to_text(int severity, char **severity_name, { int ret; - ret= iso_sev_to_text(severity, severity_name); - if(ret>0) - return(ret); - ret= burn_sev_to_text(severity, severity_name, 0); - if(ret>0) - return(ret); + ret= iso_sev_to_text(severity, severity_name); + if(ret>0) + return(ret); + ret= burn_sev_to_text(severity, severity_name, 0); + if(ret>0) + return(ret); *severity_name= ""; return(0); } @@ -396,6 +396,12 @@ int Xorriso__severity_cmp(char *sev1, char *sev2) } +char *Xorriso__severity_list(int flag) +{ + return(burn_list_sev_texts(0)); +} + + /* @param flag bit0= report libisofs error text bit1= victim is disk_path bit2= do not inquire libisofs, report msg_text and min_severity diff --git a/libisoburn/trunk/xorriso/xorriso.h b/libisoburn/trunk/xorriso/xorriso.h index cfd71f9b..12424d9e 100644 --- a/libisoburn/trunk/xorriso/xorriso.h +++ b/libisoburn/trunk/xorriso/xorriso.h @@ -529,6 +529,7 @@ int Xorriso_set_problem_status(struct XorrisO *xorriso, char *severity, */ /** Compare two severity texts for their severeness. + Unknown severity texts get defaulted to "FATAL". @since 1.2.6 @param sev1 First severity text to compare @param sev2 Second severity text to compare @@ -539,6 +540,16 @@ int Xorriso_set_problem_status(struct XorrisO *xorriso, char *severity, int Xorriso__severity_cmp(char *sev1, char *sev2); +/** Return a blank separated list of severity names. Sorted from low + to high severity. + @since 1.2.6 + @param flag Bitfield for control purposes (unused yet, submit 0) + @return A constant string with the severity names +*/ +char *Xorriso__severity_list(int flag); + + + /** Obtain the current problem status of the xorriso handle. @param xorriso The environment handle @param severity The severity text matching the current problem status diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 6eb79119..664e2dca 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.12.13.193255" +#define Xorriso_timestamP "2012.12.15.092821"