mirror of
https://github.com/ImageMagick/ImageMagick.git
synced 2026-05-31 11:18:42 +02:00
This commit is contained in:
@@ -383,19 +383,6 @@ static int ModuleCompare(const void *x,const void *y)
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline int MagickReadDirectory(DIR *directory,struct dirent *entry,
|
||||
struct dirent **result)
|
||||
{
|
||||
#if defined(MAGICKCORE_HAVE_READDIR_R)
|
||||
return(readdir_r(directory,entry,result));
|
||||
#else
|
||||
(void) entry;
|
||||
errno=0;
|
||||
*result=readdir(directory);
|
||||
return(errno);
|
||||
#endif
|
||||
}
|
||||
|
||||
MagickExport char **GetModuleList(const char *pattern,
|
||||
const MagickModuleType type,size_t *number_modules,ExceptionInfo *exception)
|
||||
{
|
||||
|
||||
@@ -41,6 +41,19 @@ extern MagickPrivate void
|
||||
ChopPathComponents(char *,const size_t),
|
||||
ExpandFilename(char *);
|
||||
|
||||
static inline int MagickReadDirectory(DIR *directory,struct dirent *entry,
|
||||
struct dirent **result)
|
||||
{
|
||||
#if defined(MAGICKCORE_HAVE_READDIR_R)
|
||||
return(readdir_r(directory,entry,result));
|
||||
#else
|
||||
(void) entry;
|
||||
errno=0;
|
||||
*result=readdir(directory);
|
||||
return(errno);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
Windows UTF8 compatibility methods.
|
||||
*/
|
||||
|
||||
@@ -1565,17 +1565,6 @@ static int FileCompare(const void *x,const void *y)
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline int MagickReadDirectory(DIR *directory,struct dirent *entry,
|
||||
struct dirent **result)
|
||||
{
|
||||
errno=0;
|
||||
entry=readdir(directory);
|
||||
*result=entry;
|
||||
if ((entry == (struct dirent *) NULL) && (errno != 0))
|
||||
return(-1);
|
||||
return(0);
|
||||
}
|
||||
|
||||
MagickPrivate char **ListFiles(const char *directory,const char *pattern,
|
||||
size_t *number_entries)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user