smbd: Remove unused "sbuf" argument from vfs_readdirname()

The only caller did not use the result.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 5b12f773ddffe576da3625a32e7e89e4d3473476..8c5943bf88b2add4bb6a01072bf1c59b06029856 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1251,9 +1251,6 @@ static NTSTATUS OpenDir_fsp(
 
 const char *ReadDirName(struct smb_Dir *dir_hnd, char **ptalloced)
 {
-       struct stat_ex st = {
-               .st_ex_nlink = 0,
-       };
        const char *n;
        char *talloced = NULL;
        connection_struct *conn = dir_hnd->conn;
@@ -1272,7 +1269,6 @@ const char *ReadDirName(struct smb_Dir *dir_hnd, char **ptalloced)
        while ((n = vfs_readdirname(conn,
                                    dir_hnd->fsp,
                                    dir_hnd->dir,
-                                   &st,
                                    &talloced))) {
                /* Ignore . and .. - we've already returned them. */
                if (ISDOT(n) || ISDOTDOT(n)) {

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 7f1bbf0655e22dfb23b39f15ffb0dec9402fa554..966a4530c1dafa94309d74f299ff7e2b47209c13 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1207,7 +1207,6 @@ off_t vfs_transfer_file(files_struct *in, files_struct *out, off_t n);
 const char *vfs_readdirname(connection_struct *conn,
                            struct files_struct *dirfsp,
                            void *p,
-                           SMB_STRUCT_STAT *sbuf,
                            char **talloced);
 int vfs_ChDir(connection_struct *conn,
                        const struct smb_filename *smb_fname);

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 305ac683d09a46983f654e15d77db90578753ac3..56e752109b819d9f0e3444070ee6c244484d7177 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -847,9 +847,11 @@ off_t vfs_transfer_file(files_struct *in, files_struct *out, off_t n)
 const char *vfs_readdirname(connection_struct *conn,
                            struct files_struct *dirfsp,
                            void *p,
-                           SMB_STRUCT_STAT *sbuf,
                            char **talloced)
 {
+       struct stat_ex st = {
+               .st_ex_nlink = 0,
+       };
        struct dirent *ptr= NULL;
        const char *dname;
        char *translated;
@@ -858,7 +860,7 @@ const char *vfs_readdirname(connection_struct *conn,
        if (!p)
                return(NULL);
 
-       ptr = SMB_VFS_READDIR(conn, dirfsp, (DIR *)p, sbuf);
+       ptr = SMB_VFS_READDIR(conn, dirfsp, (DIR *)p, &st);
        if (!ptr)
                return(NULL);