Cristy
2017-03-31 15:59:38 -04:00
parent b218117cad
commit bb499ea77d
3 changed files with 13 additions and 24 deletions
-13
View File
@@ -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)
{
+13
View File
@@ -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.
*/
-11
View File
@@ -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)
{