Mercurial > unleashed > wips

changeset 20533:790162609906

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
treewide: readdir64() -> readdir(), readdir64_r() -> readdir_r()
author Lauri Tirkkonen <lotheac@iki.fi>
date Tue, 16 Apr 2019 23:53:25 +0300
parents 226fa61c53df
children 4284b9ff0993
files include/dirent.h usr/src/cmd/ctstat/ctstat.c usr/src/cmd/diff/diff.c usr/src/lib/libvolmgt/common/volmgt_on_private.c usr/src/lib/libzfs/common/libzfs_import.c usr/src/lib/libzfs/common/libzfs_mount.c usr/src/lib/scsi/libses/common/ses_plugin.c usr/src/lib/scsi/libsmp/common/smp_plugin.c
diffstat 8 files changed, 8 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/include/dirent.h	Tue Apr 16 23:40:03 2019 +0300
+++ b/include/dirent.h	Tue Apr 16 23:53:25 2019 +0300
@@ -100,14 +100,6 @@
 extern int readdir_r(DIR *_RESTRICT_KYWD, struct dirent *_RESTRICT_KYWD,
 	struct dirent **_RESTRICT_KYWD);
 
-/*
- * FIXME source compat: these are aliases to non-64 ones in libc (though the
- * arg types are differently named).
- */
-struct dirent *readdir64(DIR *);
-int readdir64_r(DIR *_RESTRICT_KYWD, struct dirent *_RESTRICT_KYWD,
-    struct dirent **_RESTRICT_KYWD);
-
 #ifdef	__cplusplus
 }
 #endif
--- a/usr/src/cmd/ctstat/ctstat.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/cmd/ctstat/ctstat.c	Tue Apr 16 23:53:25 2019 +0300
@@ -629,7 +629,7 @@
 	if (snprintf(path, PATH_MAX, CTFS_ROOT "/%s", type) >= PATH_MAX ||
 	    (dir = opendir(path)) == NULL)
 		uu_die(gettext("bad contract type: %s\n"), type);
-	while ((de = readdir64(dir)) != NULL) {
+	while ((de = readdir(dir)) != NULL) {
 		/*
 		 * Eliminate special files (e.g. '.', '..').
 		 */
@@ -672,7 +672,7 @@
 
 	if ((dir = opendir(path)) == NULL)
 		uu_die(gettext("could not open %s"), path);
-	while ((de = readdir64(dir)) != NULL) {
+	while ((de = readdir(dir)) != NULL) {
 		/*
 		 * Eliminate special files (e.g. '.', '..').
 		 */
--- a/usr/src/cmd/diff/diff.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/cmd/diff/diff.c	Tue Apr 16 23:53:25 2019 +0300
@@ -1416,7 +1416,7 @@
 	if (dp == 0)
 		error(gettext(NO_MEM_ERR));
 
-	while (rp = readdir64(dirp)) {
+	while (rp = readdir(dirp)) {
 		ep = &dp[nitems++];
 		ep->d_reclen = rp->d_reclen;
 		ep->d_entry = 0;
--- a/usr/src/lib/libvolmgt/common/volmgt_on_private.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/lib/libvolmgt/common/volmgt_on_private.c	Tue Apr 16 23:53:25 2019 +0300
@@ -489,7 +489,7 @@
 			goto dun;
 		}
 		mtype_len = strlen(mtype);
-		while ((dp = readdir64(dirp)) != NULL) {
+		while ((dp = readdir(dirp)) != NULL) {
 			char		lpath[2 * (MAXNAMELEN+1)];
 			char		linkbuf[MAXPATHLEN+4];
 			int		lb_len;
--- a/usr/src/lib/libzfs/common/libzfs_import.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/lib/libzfs/common/libzfs_import.c	Tue Apr 16 23:53:25 2019 +0300
@@ -1174,7 +1174,7 @@
 		/*
 		 * This is not MT-safe, but we have no MT consumers of libzfs
 		 */
-		while ((dp = readdir64(dirp)) != NULL) {
+		while ((dp = readdir(dirp)) != NULL) {
 			const char *name = dp->d_name;
 			if (name[0] == '.' &&
 			    (name[1] == 0 || (name[1] == '.' && name[2] == 0)))
--- a/usr/src/lib/libzfs/common/libzfs_mount.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/lib/libzfs/common/libzfs_mount.c	Tue Apr 16 23:53:25 2019 +0300
@@ -220,7 +220,7 @@
 		return (B_TRUE);
 	}
 
-	while ((dp = readdir64(dirp)) != NULL) {
+	while ((dp = readdir(dirp)) != NULL) {
 
 		if (strcmp(dp->d_name, ".") == 0 ||
 		    strcmp(dp->d_name, "..") == 0)
--- a/usr/src/lib/scsi/libses/common/ses_plugin.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/lib/scsi/libses/common/ses_plugin.c	Tue Apr 16 23:53:25 2019 +0300
@@ -294,7 +294,7 @@
 #endif
 
 	if ((dirp = opendir(path)) != NULL) {
-		while ((dp = readdir64(dirp)) != NULL) {
+		while ((dp = readdir(dirp)) != NULL) {
 			if (strcmp(dp->d_name, ".") == 0 ||
 			    strcmp(dp->d_name, "..") == 0)
 				continue;
--- a/usr/src/lib/scsi/libsmp/common/smp_plugin.c	Tue Apr 16 23:40:03 2019 +0300
+++ b/usr/src/lib/scsi/libsmp/common/smp_plugin.c	Tue Apr 16 23:53:25 2019 +0300
@@ -281,7 +281,7 @@
 #endif
 
 	if ((dirp = opendir(path)) != NULL) {
-		while ((dp = readdir64(dirp)) != NULL) {
+		while ((dp = readdir(dirp)) != NULL) {
 			if (strcmp(dp->d_name, ".") == 0 ||
 			    strcmp(dp->d_name, "..") == 0)
 				continue;