glob.c: Remove alternative dir functions as unused

Author: Girgias

win32/glob.c

@@ -49,8 +49,6 @@
  * GLOB_NOMAGIC:
  *	Same as GLOB_NOCHECK, but it will only append pattern if it did
  *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
  * GLOB_TILDE:
  *	expand ~user/foo to the /home/dir/of/user/foo
  * GLOB_BRACE:
@@ -560,14 +558,6 @@ static int glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend
 	DIR *dirp;
 	int err;
 
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc)();
-
 	if (pathend > pathend_last)
 		return (1);
 	*pathend = EOS;
@@ -589,11 +579,7 @@ static int glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend
 	err = 0;
 
 	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = readdir;
-	while ((dp = (*readdirfunc)(dirp))) {
+	while ((dp = readdir(dirp))) {
 		register uint8_t *sc;
 		register Char *dc;
 
@@ -620,10 +606,7 @@ static int glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend
 			break;
 	}
 
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
+	closedir(dirp);
 	return(err);
 }
 
@@ -777,9 +760,6 @@ static DIR * g_opendir(Char *str, glob_t *pglob)
 			return(NULL);
 	}
 
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_opendir)(buf));
-
 	return(opendir(buf));
 }
 
@@ -789,8 +769,6 @@ static int g_lstat(Char *fn, php_win32_ioutil_stat_t *sb, glob_t *pglob)
 
 	if (g_Ctoc(fn, buf, sizeof(buf)))
 		return(-1);
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_lstat)(buf, sb));
 	return(php_win32_ioutil_lstat(buf, sb));
 }
 
@@ -800,8 +778,6 @@ static int g_stat(Char *fn, php_win32_ioutil_stat_t *sb, glob_t *pglob)
 
 	if (g_Ctoc(fn, buf, sizeof(buf)))
 		return(-1);
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_stat)(buf, sb));
 	return(php_win32_ioutil_stat(buf, sb));
 }
 

win32/glob.h

@@ -53,17 +53,6 @@ typedef struct {
 	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
 	int (*gl_errfunc)(const char *, int);
-
-	/*
-	 * Alternate filesystem access methods for glob; replacement
-	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
-	 * and lstat(2).
-	 */
-	void (*gl_closedir)(void *);
-	struct dirent *(*gl_readdir)(void *);
-	void *(*gl_opendir)(const char *);
-	int (*gl_lstat)(const char *, php_win32_ioutil_stat_t *);
-	int (*gl_stat)(const char *, php_win32_ioutil_stat_t *);
 } glob_t;
 
 /* Flags */
@@ -73,7 +62,6 @@ typedef struct {
 #define	GLOB_MARK	0x0008	/* Append / to matching directories. */
 #define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
 #define	GLOB_NOSORT	0x0020	/* Don't sort. */
-#define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
 #define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */