From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 8 Mar 2014 17:22:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2604
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fcb8c384711102f157fdb0b197e93da25b23380;p=imagemagick

---

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 282f43589..7eafc13e1 100644
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -539,13 +539,13 @@ MagickExport char **GetCoderList(const char *pattern,
 */
 static MagickBooleanType InitializeCoderList(ExceptionInfo *exception)
 {
-  if ((coder_list == (SplayTreeInfo *) NULL) &&
+  if ((coder_list == (SplayTreeInfo *) NULL) ||
       (instantiate_coder == MagickFalse))
     {
       if (coder_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&coder_semaphore);
       LockSemaphoreInfo(coder_semaphore);
-      if ((coder_list == (SplayTreeInfo *) NULL) &&
+      if ((coder_list == (SplayTreeInfo *) NULL) ||
           (instantiate_coder == MagickFalse))
         {
           (void) LoadCoderLists(MagickCoderFilename,exception);
diff --git a/MagickCore/color.c b/MagickCore/color.c
index 359b6297f..0c5f2c6ac 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -1515,13 +1515,13 @@ MagickExport void GetColorTuple(const PixelInfo *pixel,
 */
 static MagickBooleanType InitializeColorList(ExceptionInfo *exception)
 {
-  if ((color_list == (LinkedListInfo *) NULL) &&
+  if ((color_list == (LinkedListInfo *) NULL) ||
       IfMagickFalse(instantiate_color))
     {
       if (color_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&color_semaphore);
       LockSemaphoreInfo(color_semaphore);
-      if ((color_list == (LinkedListInfo *) NULL) &&
+      if ((color_list == (LinkedListInfo *) NULL) ||
           IfMagickFalse(instantiate_color))
         {
           (void) LoadColorLists(ColorFilename,exception);
diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 43ed3169b..6e9749655 100644
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -902,13 +902,13 @@ MagickExport const char *GetConfigureValue(const ConfigureInfo *configure_info)
 */
 static MagickBooleanType InitializeConfigureList(ExceptionInfo *exception)
 {
-  if ((configure_list == (LinkedListInfo *) NULL) &&
+  if ((configure_list == (LinkedListInfo *) NULL) ||
       (instantiate_configure == MagickFalse))
     {
       if (configure_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&configure_semaphore);
       LockSemaphoreInfo(configure_semaphore);
-      if ((configure_list == (LinkedListInfo *) NULL) &&
+      if ((configure_list == (LinkedListInfo *) NULL) ||
           (instantiate_configure == MagickFalse))
         {
           (void) LoadConfigureLists(ConfigureFilename,exception);
diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index dc3d339e8..890468be8 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -710,13 +710,13 @@ MagickExport MagickBooleanType GetDelegateThreadSupport(
 */
 static MagickBooleanType InitializeDelegateList(ExceptionInfo *exception)
 {
-  if ((delegate_list == (LinkedListInfo *) NULL) &&
+  if ((delegate_list == (LinkedListInfo *) NULL) ||
       IfMagickFalse(instantiate_delegate))
     {
       if (delegate_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&delegate_semaphore);
       LockSemaphoreInfo(delegate_semaphore);
-      if ((delegate_list == (LinkedListInfo *) NULL) &&
+      if ((delegate_list == (LinkedListInfo *) NULL) ||
           IfMagickFalse(instantiate_delegate))
         {
           (void) LoadDelegateLists(DelegateFilename,exception);
diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index faf3dd601..de2934acb 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -813,13 +813,13 @@ MagickExport const char *GetLocaleValue(const LocaleInfo *locale_info)
 */
 static MagickBooleanType InitializeLocaleList(ExceptionInfo *exception)
 {
-  if ((locale_list == (SplayTreeInfo *) NULL) &&
+  if ((locale_list == (SplayTreeInfo *) NULL) ||
       (instantiate_locale == MagickFalse))
     {
       if (locale_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&locale_semaphore);
       LockSemaphoreInfo(locale_semaphore);
-      if ((locale_list == (SplayTreeInfo *) NULL) &&
+      if ((locale_list == (SplayTreeInfo *) NULL) ||
           (instantiate_locale == MagickFalse))
         {
           char
diff --git a/MagickCore/log.c b/MagickCore/log.c
index 81b689011..467cafd66 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -535,12 +535,13 @@ MagickExport const char *GetLogName(void)
 */
 static MagickBooleanType InitializeLogList(ExceptionInfo *exception)
 {
-  if ((log_list == (LinkedListInfo *) NULL) && (instantiate_log == MagickFalse))
+  if ((log_list == (LinkedListInfo *) NULL) ||
+      (instantiate_log == MagickFalse))
     {
       if (log_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&log_semaphore);
       LockSemaphoreInfo(log_semaphore);
-      if ((log_list == (LinkedListInfo *) NULL) &&
+      if ((log_list == (LinkedListInfo *) NULL) ||
           (instantiate_log == MagickFalse))
         {
           (void) LoadLogLists(LogFilename,exception);
diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index f44684adb..b05063593 100644
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -529,13 +529,13 @@ MagickExport const char *GetMagicName(const MagicInfo *magic_info)
 */
 static MagickBooleanType InitializeMagicList(ExceptionInfo *exception)
 {
-  if ((magic_list == (LinkedListInfo *) NULL) &&
+  if ((magic_list == (LinkedListInfo *) NULL) ||
       (instantiate_magic == MagickFalse))
     {
       if (magic_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&magic_semaphore);
       LockSemaphoreInfo(magic_semaphore);
-      if ((magic_list == (LinkedListInfo *) NULL) &&
+      if ((magic_list == (LinkedListInfo *) NULL) ||
           (instantiate_magic == MagickFalse))
         {
           (void) LoadMagicLists(MagicFilename,exception);
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index d2f0ef4be..11c79c23d 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -840,13 +840,13 @@ static void *DestroyMagickNode(void *magick_info)
 static MagickBooleanType InitializeMagickList(ExceptionInfo *exception)
 {
   (void) exception;
-  if ((magick_list == (SplayTreeInfo *) NULL) &&
+  if ((magick_list == (SplayTreeInfo *) NULL) ||
       (instantiate_magick == MagickFalse))
     {
       if (magick_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&magick_semaphore);
       LockSemaphoreInfo(magick_semaphore);
-      if ((magick_list == (SplayTreeInfo *) NULL) &&
+      if ((magick_list == (SplayTreeInfo *) NULL) ||
           (instantiate_magick == MagickFalse))
         {
           MagickBooleanType
diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index f7dcb23d1..d29a46758 100644
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -604,13 +604,13 @@ MagickExport const char *GetMimeType(const MimeInfo *mime_info)
 */
 static MagickBooleanType InitializeMimeList(ExceptionInfo *exception)
 {
-  if ((mime_list == (LinkedListInfo *) NULL) &&
+  if ((mime_list == (LinkedListInfo *) NULL) ||
       (instantiate_mime == MagickFalse))
     {
       if (mime_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&mime_semaphore);
       LockSemaphoreInfo(mime_semaphore);
-      if ((mime_list == (LinkedListInfo *) NULL) &&
+      if ((mime_list == (LinkedListInfo *) NULL) ||
           (instantiate_mime == MagickFalse))
         {
           (void) LoadMimeLists(MimeFilename,exception);
diff --git a/MagickCore/module.c b/MagickCore/module.c
index a93488e0b..bbad26033 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -865,13 +865,13 @@ static void *DestroyModuleNode(void *module_info)
 static MagickBooleanType InitializeModuleList(
   ExceptionInfo *magick_unused(exception))
 {
-  if ((module_list == (SplayTreeInfo *) NULL) &&
+  if ((module_list == (SplayTreeInfo *) NULL) ||
       (instantiate_module == MagickFalse))
     {
       if (module_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&module_semaphore);
       LockSemaphoreInfo(module_semaphore);
-      if ((module_list == (SplayTreeInfo *) NULL) &&
+      if ((module_list == (SplayTreeInfo *) NULL) ||
           (instantiate_module == MagickFalse))
         {
           MagickBooleanType
diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 19d09c4d5..f4efc4b6e 100644
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -425,13 +425,13 @@ MagickExport char *GetPolicyValue(const char *name)
 */
 static MagickBooleanType InitializePolicyList(ExceptionInfo *exception)
 {
-  if ((policy_list == (LinkedListInfo *) NULL) &&
+  if ((policy_list == (LinkedListInfo *) NULL) ||
       (instantiate_policy == MagickFalse))
     {
       if (policy_semaphore == (SemaphoreInfo *) NULL)
         ActivateSemaphoreInfo(&policy_semaphore);
       LockSemaphoreInfo(policy_semaphore);
-      if ((policy_list == (LinkedListInfo *) NULL) &&
+      if ((policy_list == (LinkedListInfo *) NULL) ||
           (instantiate_policy == MagickFalse))
         {
           (void) LoadPolicyLists(PolicyFilename,exception);
diff --git a/MagickCore/type.c b/MagickCore/type.c
index c8ca03d18..8b0881236 100644
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -782,13 +782,13 @@ MagickExport MagickBooleanType LoadFontConfigFonts(SplayTreeInfo *type_list,
 
 static MagickBooleanType InitializeTypeList(ExceptionInfo *exception)
 {
-  if ((type_list == (SplayTreeInfo *) NULL) &&
+  if ((type_list == (SplayTreeInfo *) NULL) ||
       (instantiate_type == MagickFalse))
     {
       if (type_semaphore == (SemaphoreInfo *) NULL)
 		    ActivateSemaphoreInfo(&type_semaphore);
       LockSemaphoreInfo(type_semaphore);
-      if ((type_list == (SplayTreeInfo *) NULL) &&
+      if ((type_list == (SplayTreeInfo *) NULL) ||
           (instantiate_type == MagickFalse))
         {
           (void) LoadTypeLists(MagickTypeFilename,exception);