From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 31 Mar 2017 19:59:38 +0000 (-0400)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31678
X-Git-Tag: 7.0.5-5~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb499ea77d64cb422676efb8164a3172db5e8c9a;p=imagemagick

https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31678
---

diff --git a/MagickCore/module.c b/MagickCore/module.c
index b371c8ced..a9dfcfd34 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -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)
 {
diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
index 5cb2fe7f8..c3daaf4fe 100644
--- a/MagickCore/utility-private.h
+++ b/MagickCore/utility-private.h
@@ -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.
 */
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index d5f9f0d8e..7543865ec 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -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)
 {