From 4cb6706307fb3aebe12bca948faa14d06abf85bd Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 11 Feb 2008 19:15:21 +0000 Subject: [PATCH] Introduced LIBDAX_MSGS_SEV_MISHAP --- cdrskin/cdrskin_timestamp.h | 2 +- libburn/libdax_msgs.c | 6 +++++- libburn/libdax_msgs.h | 18 +++++++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index b1503c2..af0f625 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2008.02.08.073414" +#define Cdrskin_timestamP "2008.02.11.190802" diff --git a/libburn/libdax_msgs.c b/libburn/libdax_msgs.c index 6c2a1a3..447dad7 100644 --- a/libburn/libdax_msgs.c +++ b/libburn/libdax_msgs.c @@ -254,6 +254,8 @@ int libdax_msgs__text_to_sev(char *severity_name, int *severity, *severity= LIBDAX_MSGS_SEV_FATAL; else if(strncmp(severity_name,"FAILURE",7)==0) *severity= LIBDAX_MSGS_SEV_FAILURE; + else if(strncmp(severity_name,"MISHAP",6)==0) + *severity= LIBDAX_MSGS_SEV_MISHAP; else if(strncmp(severity_name,"SORRY",5)==0) *severity= LIBDAX_MSGS_SEV_SORRY; else if(strncmp(severity_name,"WARNING",7)==0) @@ -280,7 +282,7 @@ int libdax_msgs__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\nMISHAP\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nALL"; return(1); } *severity_name= ""; @@ -292,6 +294,8 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name, *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) diff --git a/libburn/libdax_msgs.h b/libburn/libdax_msgs.h index 5bf8bae..0abc5b0 100644 --- a/libburn/libdax_msgs.h +++ b/libburn/libdax_msgs.h @@ -144,10 +144,12 @@ struct libdax_msgs_item; /** Non-fatal error messages indicating that parts of an action failed but processing may go on if one accepts deviations from the desired result. - SORRY shall also be the severity for incidents which are severe enough + SORRY may also be the severity for incidents which are severe enough for FAILURE but happen within already started irrevocable actions, like ISO image generation. A precondition for such a severity ease is that the action can be continued after the incident. + See below MISHAP for what xorriso would need instead of this kind of SORRY + an generates for itself in case of libisofs image generation. E.g.: A pattern yields no result. A speed setting cannot be made. @@ -161,6 +163,20 @@ struct libdax_msgs_item; #define LIBDAX_MSGS_SEV_SORRY 0x60000000 +/** A FAILURE (see below) which can be tolerated during long lasting + operations just because they cannot simply be stopped or revoked. + + xorriso converts libisofs SORRY messages issued during image generation + into MISHAP messages in order to allow its evaluators to distinguish + image generation problems from minor image composition problems. + E.g.: + A libisofs input file is inaccessible during image generation. + + After a MISHAP a function should behave like after SORRY. +*/ +#define LIBDAX_MSGS_SEV_MISHAP 0x64000000 + + /** Non-fatal error indicating that an important part of an action failed and that only a new setup of preconditions will give hope for sufficient success.