build: Remove sys_readdir wrapper

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 165e10ad4906160d7470dbc875f11394a37a27c3..6177bdc71049cd0f8e59413423ef52d29beb72e7 100644 (file)
--- 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 bd12e5364e57718bb41a2e57709e297835ddaed1..0033e643c197c6748e764038bcbfff8476e94877 100644 (file)
--- 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 9705dda697616fed9cb32e259b9979084fe9d717..6b778c61c06f9df016aaa79ed74d3ebd537f5bee 100644 (file)
--- 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 dcc02b5bafa97b9c7bc7c1288da3d49342520e21..88001cedc8aadf397c0ebd18c2d69a8d9b4e53ea 100644 (file)
--- 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 d49042e06bdaada92f82da8b31f3c4731bcd9bfa..808f6fb04700c47e415ac2e8c6bba63dcd56c89e 100644 (file)
--- 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 1c55fe7bbe4778234dbfaafb187fb2ecc2b7b020..f64bbcb5266ef5372cc7d410b5b3e25be854df32 100644 (file)
--- 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 12d1f66c58b24085833b3b688a838c3f5850f281..6a74b3b1a1df0ed02f1684f08dd9965ff3d7888e 100644 (file)
--- 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 599b48d89cff82463a3fa26b75df66b68c8611d1..4fd09260c603dfb47913b6d038f4e1034fc33676 100644 (file)
--- 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 b9e0cb51522a73116a1ed8ede786eb60fda33e3b..c22c50fcdd0243767ede322d8da6a7f84ad291fc 100644 (file)
--- 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;