From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 26 Mar 2014 20:58:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2542
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a23f66e2fa9503367f7b85f73d984a5e7b6d384;p=imagemagick

---

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 61107f396..ebc699ab5 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -1324,7 +1324,6 @@ MagickExport void MagickCoreGenesis(const char *path,
   (void) ConfigureComponentGenesis();
   (void) PolicyComponentGenesis();
   (void) CacheComponentGenesis();
-  (void) RegistryComponentGenesis();
   (void) ResourceComponentGenesis();
   (void) CoderComponentGenesis();
   (void) MagickComponentGenesis();
@@ -1340,6 +1339,7 @@ MagickExport void MagickCoreGenesis(const char *path,
 #if defined(MAGICKCORE_X11_DELEGATE)
   (void) XComponentGenesis();
 #endif
+  (void) RegistryComponentGenesis();
   instantiate_magickcore=MagickTrue;
   UnlockMagickMutex();
 }
@@ -1371,6 +1371,7 @@ MagickExport void MagickCoreTerminus(void)
       UnlockMagickMutex();
       return;
     }
+  RegistryComponentTerminus();
 #if defined(MAGICKCORE_X11_DELEGATE)
   XComponentTerminus();
 #endif
@@ -1392,7 +1393,6 @@ MagickExport void MagickCoreTerminus(void)
 #endif
   CoderComponentTerminus();
   ResourceComponentTerminus();
-  RegistryComponentTerminus();
   CacheComponentTerminus();
   PolicyComponentTerminus();
   ConfigureComponentTerminus();
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index b67b13745..d74f4b021 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1794,9 +1794,6 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
   char
     *passes;
 
-  ExceptionInfo
-    *exception;
-
   int
     file,
     status;
@@ -1815,11 +1812,7 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
 
   if ((path == (const char *) NULL) || (*path == '\0'))
     return(MagickFalse);
-  exception=AcquireExceptionInfo();
-  passes=(char *) GetImageRegistry(StringRegistryType,"shred-passes",exception);
-  exception=DestroyExceptionInfo(exception);
-  if (passes == (char *) NULL)
-    passes=GetEnvironmentValue("MAGICK_SHRED_PASSES");
+  passes=GetEnvironmentValue("MAGICK_SHRED_PASSES");
   if (passes == (char *) NULL)
     {
       /*