From 34b972bf002b82d1c268cd024e37f3e449bd9e61 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 21 Feb 2008 20:46:51 +0000 Subject: [PATCH] Introduced new severity ERRFILE --- libisoburn/trunk/libisoburn/burn_wrap.c | 7 ++++++- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libisoburn/trunk/libisoburn/burn_wrap.c b/libisoburn/trunk/libisoburn/burn_wrap.c index 438ea760..3f5c663e 100644 --- a/libisoburn/trunk/libisoburn/burn_wrap.c +++ b/libisoburn/trunk/libisoburn/burn_wrap.c @@ -739,6 +739,7 @@ int isoburn_get_fifo_status(struct burn_drive *d, int *size, int *free_bytes, 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 @@ -755,7 +756,7 @@ int isoburn__sev_to_text(int severity, char **severity_name, int flag) { if(flag&1) { - *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nALL"; + *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nERRFILE\nALL"; return(1); } *severity_name= ""; @@ -781,6 +782,8 @@ int isoburn__sev_to_text(int severity, char **severity_name, *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 { @@ -799,6 +802,8 @@ int isoburn__text_to_sev(char *severity_name, int *severity_number, int flag) *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 ret= burn_text_to_sev(severity_name, severity_number, 0); return(ret); diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index ea9cfa53..08b5937a 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.02.21.185203" +#define Xorriso_timestamP "2008.02.21.204613" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index 8b62aa0c..d653256f 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -245,6 +245,7 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso, 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 @@ -287,6 +288,8 @@ int Xorriso__sev_to_text(int severity, char **severity_name, *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 { @@ -305,6 +308,8 @@ int Xorriso__text_to_sev(char *severity_name, int *severity_number, int flag) *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 ret= burn_text_to_sev(severity_name, severity_number, 0); return(ret);