status;
SplayTreeInfo
- *type_cache;
+ *cache;
- type_cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
+ cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
DestroyTypeNode);
- if (type_cache == (SplayTreeInfo *) NULL)
+ if (cache == (SplayTreeInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
status=MagickTrue;
#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
while (option != (const StringInfo *) NULL)
{
(void) CopyMagickString(path,GetStringInfoPath(option),MagickPathExtent);
- status&=LoadTypeCache(type_cache,(const char *)
+ status&=LoadTypeCache(cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),0,exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
}
option=FileToString(path,~0UL,exception);
if (option != (void *) NULL)
{
- status&=LoadTypeCache(type_cache,option,path,0,exception);
+ status&=LoadTypeCache(cache,option,path,0,exception);
option=DestroyString(option);
}
font_path=DestroyString(font_path);
}
}
#endif
- if (GetNumberOfNodesInSplayTree(type_cache) == 0)
- status&=LoadTypeCache(type_cache,TypeMap,"built-in",0,exception);
- return(type_cache);
+ if (GetNumberOfNodesInSplayTree(cache) == 0)
+ status&=LoadTypeCache(cache,TypeMap,"built-in",0,exception);
+ return(cache);
}
\f
/*
%
% The format of the LoadTypeCache method is:
%
-% MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
-% const char *xml,const char *filename,const size_t depth,
-% ExceptionInfo *exception)
+% MagickBooleanType LoadTypeCache(SplayTreeInfo *cache,const char *xml,
+% const char *filename,const size_t depth,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
return(MagickTrue);
}
-static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache,
- const char *xml,const char *filename,const size_t depth,
- ExceptionInfo *exception)
+static MagickBooleanType LoadTypeCache(SplayTreeInfo *cache,const char *xml,
+ const char *filename,const size_t depth,ExceptionInfo *exception)
{
char
font_path[MagickPathExtent],
sans_exception=DestroyExceptionInfo(sans_exception);
if (xml != (char *) NULL)
{
- status&=LoadTypeCache(type_cache,xml,path,depth+1,
- exception);
+ status&=LoadTypeCache(cache,xml,path,depth+1,exception);
xml=(char *) RelinquishMagickMemory(xml);
}
}
continue;
if (LocaleCompare(keyword,"/>") == 0)
{
- status=AddValueToSplayTree(type_cache,type_info->name,type_info);
+ status=AddValueToSplayTree(cache,type_info->name,type_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name);