% March 2000 %
% %
% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
#include "MagickCore/memory_.h"
#include "MagickCore/module.h"
#include "MagickCore/module-private.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/policy.h"
#include "MagickCore/semaphore.h"
#include "MagickCore/splay-tree.h"
#include "MagickCore/static.h"
#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
#include "MagickCore/token.h"
#include "MagickCore/utility.h"
#include "MagickCore/utility-private.h"
static MagickBooleanType
GetMagickModulePath(const char *,MagickModuleType,char *,ExceptionInfo *),
+ InitializeModuleList(ExceptionInfo *),
UnregisterModule(const ModuleInfo *,ExceptionInfo *);
static void
if (modules == (char **) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ConfigureError,
- "MemoryAllocationFailed","`%s'",pattern);
+ "MemoryAllocationFailed","'%s'",pattern);
return((char **) NULL);
}
qsort((void *) modules,(size_t) i,sizeof(*modules),ModuleCompare);
if (key_value == (unsigned char *) NULL)
{
ThrowMagickException(exception,GetMagickModule(),ConfigureError,
- "RegistryKeyLookupFailed","`%s'",registery_key);
+ "RegistryKeyLookupFailed","'%s'",registery_key);
return(MagickFalse);
}
(void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",(char *) key_value,
case MagickImageCoderModule:
default:
{
- directory="modules";
+ directory="coders";
break;
}
case MagickImageFilterModule:
return(RelinquishMagickMemory(p));
}
-MagickExport MagickBooleanType InitializeModuleList(
+static MagickBooleanType InitializeModuleList(
ExceptionInfo *magick_unused(exception))
{
if ((module_list == (SplayTreeInfo *) NULL) &&
{
errno=EPERM;
(void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
- "NotAuthorized","`%s'",tag);
+ "NotAuthorized","'%s'",tag);
return(MagickFalse);
}
TagToFilterModuleName(tag,name);
if (status == MagickFalse)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",name,path);
+ "UnableToLoadModule","'%s': %s",name,path);
return(MagickFalse);
}
/*
if (handle == (ModuleHandle) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",name,lt_dlerror());
+ "UnableToLoadModule","'%s': %s",name,lt_dlerror());
return(MagickFalse);
}
/*
image_filter=(ImageFilterHandler *) lt_dlsym(handle,name);
if (image_filter == (ImageFilterHandler *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",name,lt_dlerror());
+ "UnableToLoadModule","'%s': %s",name,lt_dlerror());
else
{
size_t
tag);
if (signature != MagickImageFilterSignature)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,
+ "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag,
(unsigned long) signature,(unsigned long) MagickImageFilterSignature);
}
/*
*/
if (lt_dlclose(handle) != 0)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning,
- "UnableToCloseModule","`%s': %s",name,lt_dlerror());
+ "UnableToCloseModule","'%s': %s",name,lt_dlerror());
return(exception->severity < ErrorException ? MagickTrue : MagickFalse);
}
\f
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport MagickBooleanType OpenModule(const char *module,
+MagickPrivate MagickBooleanType OpenModule(const char *module,
ExceptionInfo *exception)
{
char
if (handle == (ModuleHandle) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s': %s",path,lt_dlerror());
+ "UnableToLoadModule","'%s': %s",path,lt_dlerror());
return(MagickFalse);
}
/*
if (module_info->register_module == (size_t (*)(void)) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToRegisterImageFormat","`%s': %s",module_name,lt_dlerror());
+ "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror());
return(MagickFalse);
}
(void) LogMagickEvent(ModuleEvent,GetMagickModule(),
if (module_info->unregister_module == (void (*)(void)) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToRegisterImageFormat","`%s': %s",module_name,lt_dlerror());
+ "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror());
return(MagickFalse);
}
(void) LogMagickEvent(ModuleEvent,GetMagickModule(),
if (signature != MagickImageCoderSignature)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "ImageCoderSignatureMismatch","`%s': %8lx != %8lx",module_name,
+ "ImageCoderSignatureMismatch","'%s': %8lx != %8lx",module_name,
(unsigned long) signature,(unsigned long) MagickImageCoderSignature);
return(MagickFalse);
}
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport MagickBooleanType OpenModules(ExceptionInfo *exception)
+MagickPrivate MagickBooleanType OpenModules(ExceptionInfo *exception)
{
char
**modules;
status=AddValueToSplayTree(module_list,module_info->tag,module_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),ResourceLimitError,
- "MemoryAllocationFailed","`%s'",module_info->tag);
+ "MemoryAllocationFailed","'%s'",module_info->tag);
return(module_info);
}
\f
if (lt_dlclose((ModuleHandle) module_info->handle) != 0)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning,
- "UnableToCloseModule","`%s': %s",module_info->tag,lt_dlerror());
+ "UnableToCloseModule","'%s': %s",module_info->tag,lt_dlerror());
return(MagickFalse);
}
return(MagickTrue);
{
errno=EPERM;
(void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
- "NotAuthorized","`%s'",tag);
+ "NotAuthorized","'%s'",tag);
return(MagickFalse);
}
#if defined(MAGICKCORE_BUILD_MODULES)
image_filter=(ImageFilterHandler *) analyzeImage;
if (image_filter == (ImageFilterHandler *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "UnableToLoadModule","`%s'",tag);
+ "UnableToLoadModule","'%s'",tag);
else
{
size_t
if (signature != MagickImageFilterSignature)
{
(void) ThrowMagickException(exception,GetMagickModule(),ModuleError,
- "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,
+ "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag,
(unsigned long) signature,(unsigned long)
MagickImageFilterSignature);
return(MagickFalse);