X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libsysio%2Fsrc%2Freaddir.c;h=c232b2928dc816235183d956ceb24c5c9d8b7e08;hb=605817db843fdd8e433751180e516d6497323956;hp=af21c168c188934a33ebd9ecae2c446d02c1f344;hpb=567285197e592000b7a713d65b66e27314a11c2f;p=fs%2Flustre-release.git

diff --git a/libsysio/src/readdir.c b/libsysio/src/readdir.c
index af21c16..c232b29 100644
--- a/libsysio/src/readdir.c
+++ b/libsysio/src/readdir.c
@@ -105,7 +105,7 @@ int
 _SCANDIR(const char *dirname, 
 	 _DIRENT_T ***namelist, 
 	 int (*filter) (const _DIRENT_T *), 
-	 int (*cmp) (const void *, const void *))
+	 int (*compar) (const void *, const void *))
 {
 	DIR *dir = NULL;
 	_DIRENT_T *de 	  = NULL,
@@ -117,7 +117,7 @@ _SCANDIR(const char *dirname,
 
 	SYSIO_INTERFACE_ENTER;
 
-	if ((dir = opendir(dirname)) == NULL)
+	if ((dir = SYSIO_INTERFACE_NAME(opendir)(dirname)) == NULL)
 		SYSIO_INTERFACE_RETURN(-1, -errno);
 
 	while ((de = _READDIR(dir)) != NULL) {
@@ -137,12 +137,15 @@ _SCANDIR(const char *dirname,
 			s[i++] = (_DIRENT_T *)memcpy(nextde, de, desize);
 		}
 	}
-	if (cmp)
-		qsort (s, i, sizeof (*s), cmp);
+	if (compar)
+		qsort (s,
+		       i,
+		       sizeof (*s),
+		       (int (*)(const void *, const void *))compar);
 
 	*namelist = s;
 
-	closedir(dir);
+	SYSIO_INTERFACE_NAME(closedir)(dir);
 
 	SYSIO_INTERFACE_RETURN(i, 0);
 }