ModuleInfo
*module_info;
- module_list=NewSplayTree(CompareSplayTreeString,
+ SplayTreeInfo
+ *splay_tree;
+
+ splay_tree=NewSplayTree(CompareSplayTreeString,
(void *(*)(void *)) NULL,DestroyModuleNode);
- if (module_list == (SplayTreeInfo *) NULL)
+ if (splay_tree == (SplayTreeInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,
"MemoryAllocationFailed");
module_info=AcquireModuleInfo((const char *) NULL,"[boot-strap]");
module_info->stealth=MagickTrue;
- status=AddValueToSplayTree(module_list,module_info->tag,module_info);
+ status=AddValueToSplayTree(splay_tree,module_info->tag,module_info);
if (status == MagickFalse)
ThrowFatalException(ResourceLimitFatalError,
"MemoryAllocationFailed");
if (lt_dlinit() != 0)
ThrowFatalException(ModuleFatalError,
"UnableToInitializeModuleLoader");
+ module_list=splay_tree;
}
UnlockSemaphoreInfo(module_semaphore);
}
LockSemaphoreInfo(type_semaphore);
if (type_cache == (SplayTreeInfo *) NULL)
{
- type_cache=AcquireTypeCache(MagickTypeFilename,exception);
+ SplayTreeInfo
+ *splay_tree;
+
+ splay_tree=AcquireTypeCache(MagickTypeFilename,exception);
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
- (void) NTAcquireTypeCache(type_cache,exception);
+ (void) NTAcquireTypeCache(splay_tree,exception);
#endif
#if defined(MAGICKCORE_FONTCONFIG_DELEGATE)
- (void) LoadFontConfigFonts(type_cache,exception);
+ (void) LoadFontConfigFonts(splay_tree,exception);
#endif
+ type_cache=splay_tree;
}
UnlockSemaphoreInfo(type_semaphore);
}