diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c index c7980ee1..f7e579b3 100644 --- a/libisoburn/burn_wrap.c +++ b/libisoburn/burn_wrap.c @@ -38,9 +38,6 @@ #endif /* Xorriso_standalonE */ -/* <<< remove macro and alternative outdated code */ -#define Libisoburn_on__libburn_after_0_4_2 yes - #include "libisoburn.h" #include "isoburn.h" @@ -848,34 +845,6 @@ int isoburn_get_fifo_status(struct burn_drive *d, int *size, int *free_bytes, } - -/* >>> todo: throw out the copies of libdax_msgs entrails */ - -#ifndef Libisoburn_on__libburn_after_0_4_2 - -/* <<< to be replaced by libburn-0.4.3 API call burn_sev_to_text(). - This is a copy of libdax_msgs__sev_to_text() which is not exposed - by the API of of libburn-0.4.2 . As soon as xorriso gets based on - libburn-0.4.4 this redundancy is to be removed. - It is safe, nevertheless, because the severity codes are eternal. -*/ -#define LIBDAX_MSGS_SEV_ALL 0x00000000 -#define LIBDAX_MSGS_SEV_ERRFILE 0x08000000 -#define LIBDAX_MSGS_SEV_DEBUG 0x10000000 -#define LIBDAX_MSGS_SEV_UPDATE 0x20000000 -#define LIBDAX_MSGS_SEV_NOTE 0x30000000 -#define LIBDAX_MSGS_SEV_HINT 0x40000000 -#define LIBDAX_MSGS_SEV_WARNING 0x50000000 -#define LIBDAX_MSGS_SEV_SORRY 0x60000000 -#define LIBDAX_MSGS_SEV_MISHAP 0x64000000 -#define LIBDAX_MSGS_SEV_FAILURE 0x68000000 -#define LIBDAX_MSGS_SEV_FATAL 0x70000000 -#define LIBDAX_MSGS_SEV_ABORT 0x71000000 -#define LIBDAX_MSGS_SEV_NEVER 0x7fffffff - -#endif /* ! Libisoburn_on__libburn_after_0_4_2 */ - - /* @param flag bit0= -reserved- bit1= this is a libburn severity */ @@ -884,53 +853,11 @@ int isoburn__sev_to_text(int severity, char **severity_name, { int ret; - ret= iso_sev_to_text(severity, severity_name); - if(ret>0) - return(ret); -#ifdef Libisoburn_on__libburn_after_0_4_2 - ret= burn_sev_to_text(severity, severity_name, 0); - return(ret); -#else - - if(flag&1) { - *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nERRFILE\nALL"; - return(1); - } - *severity_name= ""; - if(severity>=LIBDAX_MSGS_SEV_NEVER) - *severity_name= "NEVER"; - else if(severity>=LIBDAX_MSGS_SEV_ABORT) - *severity_name= "ABORT"; - else if(severity>=LIBDAX_MSGS_SEV_FATAL) - *severity_name= "FATAL"; - else if(severity>=LIBDAX_MSGS_SEV_FAILURE) - *severity_name= "FAILURE"; - else if(severity>=LIBDAX_MSGS_SEV_MISHAP) - *severity_name= "MISHAP"; - else if(severity>=LIBDAX_MSGS_SEV_SORRY) - *severity_name= "SORRY"; - else if(severity>=LIBDAX_MSGS_SEV_WARNING) - *severity_name= "WARNING"; - else if(severity>=LIBDAX_MSGS_SEV_HINT) - *severity_name= "HINT"; - else if(severity>=LIBDAX_MSGS_SEV_NOTE) - *severity_name= "NOTE"; - else if(severity>=LIBDAX_MSGS_SEV_UPDATE) - *severity_name= "UPDATE"; - else if(severity>=LIBDAX_MSGS_SEV_DEBUG) - *severity_name= "DEBUG"; - else if(severity>=LIBDAX_MSGS_SEV_ERRFILE) - *severity_name= "ERRFILE"; - else if(severity>=LIBDAX_MSGS_SEV_ALL) - *severity_name= "ALL"; - else { - *severity_name= ""; - return(0); - } - return(1); - -#endif /* ! Libisoburn_on__libburn_after_0_4_2 */ - + ret= iso_sev_to_text(severity, severity_name); + if(ret>0) + return(ret); + ret= burn_sev_to_text(severity, severity_name, 0); + return(ret); } @@ -938,21 +865,10 @@ int isoburn__text_to_sev(char *severity_name, int *severity_number, int flag) { int ret= 1; - ret= iso_text_to_sev(severity_name, severity_number); - if(ret>0) - return(ret); - -#ifndef Libisoburn_on__libburn_after_0_4_2 - if(severity_name[0]==0) - *severity_number= 0; - else if(strcmp(severity_name, "MISHAP")==0) - *severity_number= LIBDAX_MSGS_SEV_MISHAP; - else if(strcmp(severity_name, "ERRFILE")==0) - *severity_number= LIBDAX_MSGS_SEV_ERRFILE; - else -#endif /* ! Libisoburn_on__libburn_after_0_4_2 */ - - ret= burn_text_to_sev(severity_name, severity_number, 0); + ret= iso_text_to_sev(severity_name, severity_number); + if(ret>0) + return(ret); + ret= burn_text_to_sev(severity_name, severity_number, 0); return(ret); } diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c index cba1eb35..85a29de2 100644 --- a/libisoburn/isoburn.c +++ b/libisoburn/isoburn.c @@ -436,25 +436,6 @@ int isoburn_prepare_new_image(struct burn_drive *d, struct burn_disc **disc, ret= isoburn_prepare_disc_aux(d, out_drive, disc, opts, 1); if (ret<=0) return ret; - -#ifdef NIX - struct isoburn *in_o, *out_o; - - /* Hand over source reference for optional fifo status inquiry */ - if(out_drive==NULL) - return 1; - ret= isoburn_find_emulator(&out_o, out_drive, 0); - if(ret<0 || out_o==NULL) - return 1; - ret= isoburn_find_emulator(&in_o, d, 0); - if(ret<0 || in_o==NULL) - return 1; /* then without fifo status inquiry */ - if(out_o->iso_source!=NULL) - burn_source_free(out_o->iso_source); - out_o->iso_source= in_o->iso_source; - in_o->iso_source= NULL; -#endif /* NIX */ - return 1; } diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 536f9161..850954e6 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.06.09.165735" +#define Xorriso_timestamP "2008.06.10.094304"