From afdb78075c29774c550625e1115ffb7eaf6e015a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 28 Mar 2012 13:03:00 +1100
Subject: build: Remove sys_readdir wrapper

---
 libgpo/gpext/gpext.c           | 2 +-
 source3/include/proto.h        | 1 -
 source3/lib/system.c           | 9 ---------
 source3/lib/util.c             | 2 +-
 source3/modules/onefs_dir.c    | 2 +-
 source3/modules/vfs_default.c  | 2 +-
 source3/modules/vfs_netatalk.c | 2 +-
 source3/param/loadparm.c       | 2 +-
 source3/utils/net_usershare.c  | 4 ++--
 9 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 165e10ad49..6177bdc710 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -496,7 +496,7 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
 		return map_nt_error_from_unix_common(errno);
 	}
 
-	while ((dirent = sys_readdir(dir))) {
+	while ((dirent = readdir(dir))) {
 
 		fstring name; /* forgive me... */
 		char *p;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bd12e5364e..0033e643c1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -338,7 +338,6 @@ int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len);
 int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len);
 void kernel_flock(int fd, uint32 share_mode, uint32 access_mask);
 SMB_STRUCT_DIR *sys_fdopendir(int fd);
-SMB_STRUCT_DIRENT *sys_readdir(SMB_STRUCT_DIR *dirp);
 void sys_seekdir(SMB_STRUCT_DIR *dirp, long offset);
 long sys_telldir(SMB_STRUCT_DIR *dirp);
 void sys_rewinddir(SMB_STRUCT_DIR *dirp);
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 9705dda697..6b778c61c0 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -633,15 +633,6 @@ SMB_STRUCT_DIR *sys_fdopendir(int fd)
 #endif
 }
 
-/*******************************************************************
- A readdir wrapper.
-********************************************************************/
-
-SMB_STRUCT_DIRENT *sys_readdir(SMB_STRUCT_DIR *dirp)
-{
-	return readdir(dirp);
-}
-
 /*******************************************************************
  A seekdir wrapper.
 ********************************************************************/
diff --git a/source3/lib/util.c b/source3/lib/util.c
index dcc02b5baf..88001cedc8 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1037,7 +1037,7 @@ const char *readdirname(SMB_STRUCT_DIR *p)
 	if (!p)
 		return(NULL);
 
-	ptr = (SMB_STRUCT_DIRENT *)sys_readdir(p);
+	ptr = (SMB_STRUCT_DIRENT *)readdir(p);
 	if (!ptr)
 		return(NULL);
 
diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index d49042e06b..808f6fb047 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -313,7 +313,7 @@ onefs_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
 	if (!lp_parm_bool(SNUM(handle->conn), PARM_ONEFS_TYPE,
 	    PARM_USE_READDIRPLUS, PARM_USE_READDIRPLUS_DEFAULT))
 	{
-		return sys_readdir(dirp);
+		return readdir(dirp);
 	}
 
 	/* Retrieve state based off DIR handle */
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 1c55fe7bbe..f64bbcb526 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -374,7 +374,7 @@ static SMB_STRUCT_DIRENT *vfswrap_readdir(vfs_handle_struct *handle,
 	SMB_STRUCT_DIRENT *result;
 
 	START_PROFILE(syscall_readdir);
-	result = sys_readdir(dirp);
+	result = readdir(dirp);
 	/* Default Posix readdir() does not give us stat info.
 	 * Set to invalid to indicate we didn't return this info. */
 	if (sbuf)
diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index 12d1f66c58..6a74b3b1a1 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -160,7 +160,7 @@ static void atalk_rrmdir(TALLOC_CTX *ctx, char *path)
 	dir = opendir(path);
 	if (!dir) return;
 
-	while (NULL != (dent = sys_readdir(dir))) {
+	while (NULL != (dent = readdir(dir))) {
 		if (strcmp(dent->d_name, ".") == 0 ||
 		    strcmp(dent->d_name, "..") == 0)
 			continue;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 599b48d89c..4fd09260c6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -8806,7 +8806,7 @@ int load_usershare_shares(struct smbd_server_connection *sconn,
 	}
 
 	for (num_dir_entries = 0, num_bad_dir_entries = 0, num_tmp_dir_entries = 0;
-			(de = sys_readdir(dp));
+			(de = readdir(dp));
 			num_dir_entries++ ) {
 		int r;
 		const char *n = de->d_name;
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index b9e0cb5152..c22c50fcdd 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -226,7 +226,7 @@ static int get_share_list(TALLOC_CTX *ctx, const char *wcard, bool only_ours)
 		return -1;
 	}
 
-	while((de = sys_readdir(dp)) != 0) {
+	while((de = readdir(dp)) != 0) {
 		SMB_STRUCT_STAT sbuf;
 		char *path;
 		const char *n = de->d_name;
@@ -565,7 +565,7 @@ static int count_num_usershares(void)
 		return -1;
 	}
 
-	while((de = sys_readdir(dp)) != 0) {
+	while((de = readdir(dp)) != 0) {
 		SMB_STRUCT_STAT sbuf;
 		char *path;
 		const char *n = de->d_name;
-- 
cgit