ExceptionInfo *exception)
{
LinkedListInfo
- *delegate_cache;
+ *cache;
MagickStatusType
status;
- delegate_cache=NewLinkedList(0);
- if (delegate_cache == (LinkedListInfo *) NULL)
+ cache=NewLinkedList(0);
+ if (cache == (LinkedListInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
status=MagickTrue;
#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
option=(const StringInfo *) GetNextValueInLinkedList(options);
while (option != (const StringInfo *) NULL)
{
- status&=LoadDelegateCache(delegate_cache,(const char *)
+ status&=LoadDelegateCache(cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),0,exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
}
options=DestroyConfigureOptions(options);
}
#endif
- if (IsLinkedListEmpty(delegate_cache) != MagickFalse)
- status&=LoadDelegateCache(delegate_cache,DelegateMap,"built-in",0,
- exception);
- return(delegate_cache);
+ if (IsLinkedListEmpty(cache) != MagickFalse)
+ status&=LoadDelegateCache(cache,DelegateMap,"built-in",0,exception);
+ return(cache);
}
\f
/*
%
% The format of the LoadDelegateCache method is:
%
-% MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
+% MagickBooleanType LoadDelegateCache(LinkedListInfo *cache,
% const char *xml,const char *filename,const size_t depth,
% ExceptionInfo *exception)
%
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache,
+static MagickBooleanType LoadDelegateCache(LinkedListInfo *cache,
const char *xml,const char *filename,const size_t depth,
ExceptionInfo *exception)
{
file_xml=FileToXML(path,~0UL);
if (file_xml != (char *) NULL)
{
- status&=LoadDelegateCache(delegate_cache,file_xml,path,
+ status&=LoadDelegateCache(cache,file_xml,path,
depth+1,exception);
file_xml=DestroyString(file_xml);
}
continue;
if (LocaleCompare(keyword,"/>") == 0)
{
- status=AppendValueToLinkedList(delegate_cache,delegate_info);
+ status=AppendValueToLinkedList(cache,delegate_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
status;
SplayTreeInfo
- *locale_cache;
+ *cache;
- locale_cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
+ cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
DestroyLocaleNode);
if (locale_cache == (SplayTreeInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
option=(const StringInfo *) GetNextValueInLinkedList(options);
while (option != (const StringInfo *) NULL)
{
- status&=LoadLocaleCache(locale_cache,(const char *)
+ status&=LoadLocaleCache(cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),locale,0,
exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
}
options=DestroyLocaleOptions(options);
- if (GetNumberOfNodesInSplayTree(locale_cache) == 0)
+ if (GetNumberOfNodesInSplayTree(cache) == 0)
{
options=GetLocaleOptions("english.xml",exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
while (option != (const StringInfo *) NULL)
{
- status&=LoadLocaleCache(locale_cache,(const char *)
+ status&=LoadLocaleCache(cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),locale,0,
exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
}
}
#endif
- if (GetNumberOfNodesInSplayTree(locale_cache) == 0)
- status&=LoadLocaleCache(locale_cache,LocaleMap,"built-in",locale,0,
+ if (GetNumberOfNodesInSplayTree(cache) == 0)
+ status&=LoadLocaleCache(cache,LocaleMap,"built-in",locale,0,
exception);
- return(locale_cache);
+ return(cache);
}
\f
#if defined(MAGICKCORE_LOCALE_SUPPORT)
%
% The format of the LoadLocaleCache method is:
%
-% MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
-% const char *xml,const char *filename,const size_t depth,
-% ExceptionInfo *exception)
+% MagickBooleanType LoadLocaleCache(SplayTreeInfo *cache,const char *xml,
+% const char *filename,const size_t depth,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
exit(1);
}
-static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
- const char *xml,const char *filename,const char *locale,const size_t depth,
- ExceptionInfo *exception)
+static MagickBooleanType LoadLocaleCache(SplayTreeInfo *cache,const char *xml,
+ const char *filename,const char *locale,const size_t depth,ExceptionInfo *exception)
{
char
keyword[MagickLocaleExtent],
file_xml=FileToXML(path,~0UL);
if (file_xml != (char *) NULL)
{
- status&=LoadLocaleCache(locale_cache,file_xml,path,locale,
+ status&=LoadLocaleCache(cache,file_xml,path,locale,
depth+1,exception);
file_xml=DestroyString(file_xml);
}
locale_info->tag=ConstantString(tag);
locale_info->message=ConstantString(message);
locale_info->signature=MagickCoreSignature;
- status=AddValueToSplayTree(locale_cache,locale_info->tag,locale_info);
+ status=AddValueToSplayTree(cache,locale_info->tag,locale_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
ExceptionInfo *exception)
{
LinkedListInfo
- *mime_cache;
+ *cache;
MagickStatusType
status;
- mime_cache=NewLinkedList(0);
- if (mime_cache == (LinkedListInfo *) NULL)
+ cache=NewLinkedList(0);
+ if (cache == (LinkedListInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
status=MagickTrue;
#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
option=(const StringInfo *) GetNextValueInLinkedList(options);
while (option != (const StringInfo *) NULL)
{
- status&=LoadMimeCache(mime_cache,(const char *)
+ status&=LoadMimeCache(cache,(const char *)
GetStringInfoDatum(option),GetStringInfoPath(option),0,exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
}
options=DestroyConfigureOptions(options);
}
#endif
- if (IsLinkedListEmpty(mime_cache) != MagickFalse)
- status&=LoadMimeCache(mime_cache,MimeMap,"built-in",0,exception);
- return(mime_cache);
+ if (IsLinkedListEmpty(cache) != MagickFalse)
+ status&=LoadMimeCache(cache,MimeMap,"built-in",0,exception);
+ return(cache);
}
\f
/*
%
% The format of the LoadMimeCache method is:
%
-% MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache,
-% const char *xml,const char *filename,const size_t depth,
-% ExceptionInfo *exception)
+% MagickBooleanType LoadMimeCache(LinkedListInfo *cache,const char *xml,
+% const char *filename,const size_t depth,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache,
- const char *xml,const char *filename,const size_t depth,
- ExceptionInfo *exception)
+static MagickBooleanType LoadMimeCache(LinkedListInfo *cache,const char *xml,
+ const char *filename,const size_t depth,ExceptionInfo *exception)
{
const char
*attribute;
file_xml=FileToXML(path,~0UL);
if (file_xml != (char *) NULL)
{
- status&=LoadMimeCache(mime_cache,file_xml,path,depth+1,exception);
+ status&=LoadMimeCache(cache,file_xml,path,depth+1,exception);
file_xml=DestroyString(file_xml);
}
}
attribute=GetXMLTreeAttribute(mime,"type");
if (attribute != (const char *) NULL)
mime_info->type=ConstantString(attribute);
- status=AppendValueToLinkedList(mime_cache,mime_info);
+ status=AppendValueToLinkedList(cache,mime_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",filename);