(no commit message)

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 990c8943381110e72b8002a7fd4029337ac29232..e78729b9edba47063021a75470d52bc8e12b789f 100644 (file)
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -125,7 +125,7 @@ MagickExport CacheView *AcquireAuthenticCacheView(const Image *image)
     {
       CatchException(exception);
       MagickCoreTerminus();
-      _exit(1);
+      _exit(CacheFatalError);
     }
   exception=DestroyExceptionInfo(exception);
   return(cache_view);

diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h
index 53d4ddabe516b15891be924bc1b68a6f11c397f7..98f64c336853d357e4ae4a2f61a7a4a713c813d9 100644 (file)
--- a/MagickCore/exception-private.h
+++ b/MagickCore/exception-private.h
@@ -49,7 +49,7 @@ extern "C" {
   CatchException(&exception); \
   (void) DestroyExceptionInfo(&exception); \
   MagickCoreTerminus(); \
-  _exit(1); \
+  _exit(severity); \
 }
 #define ThrowFileException(exception,severity,tag,context) \
 { \

diff --git a/MagickCore/exception.c b/MagickCore/exception.c
index 209b562bc490f1dc137b0c45483c1e58d4b22bed..5e7d9eac0de7981a820f8508e2dfd1f374e269b1 100644 (file)
--- a/MagickCore/exception.c
+++ b/MagickCore/exception.c
@@ -325,14 +325,12 @@ static void DefaultErrorHandler(const ExceptionType magick_unused(severity),
 %
 %    o severity: Specifies the numeric error category.
 %
-%    o reason: Specifies the reason to display before terminating the
-%      program.
+%    o reason: Specifies the reason to display before terminating the program.
 %
 %    o description: Specifies any description to the reason.
 %
 */
-static void DefaultFatalErrorHandler(
-  const ExceptionType magick_unused(severity),
+static void DefaultFatalErrorHandler(const ExceptionType severity,
   const char *reason,const char *description)
 {
   if (reason == (char *) NULL)
@@ -343,7 +341,7 @@ static void DefaultFatalErrorHandler(
   (void) FormatLocaleFile(stderr,".\n");
   (void) fflush(stderr);
   MagickCoreTerminus();
-  exit(1);
+  exit(severity);
 }
 \f
 /*

diff --git a/MagickCore/exception.h b/MagickCore/exception.h
index 422012e3f24cb5d1382fea152e211e11dfe0f825..e37738b5c2eb7fded233aa58717995aadc8ea938 100644 (file)
--- a/MagickCore/exception.h
+++ b/MagickCore/exception.h
@@ -153,8 +153,8 @@ extern MagickExport FatalErrorHandler
 extern MagickExport MagickBooleanType
   ThrowException(ExceptionInfo *,const ExceptionType,const char *,
     const char *),
-  ThrowMagickExceptionList(ExceptionInfo *,const char *,const char *,const size_t,
-    const ExceptionType,const char *,const char *,va_list),
+  ThrowMagickExceptionList(ExceptionInfo *,const char *,const char *,
+    const size_t,const ExceptionType,const char *,const char *,va_list),
   ThrowMagickException(ExceptionInfo *,const char *,const char *,const size_t,
     const ExceptionType,const char *,const char *,...)
     magick_attribute((__format__ (__printf__,7,8)));