sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

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

Browse Source 
The only caller did not use the result.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2023-06-20 12:29:29 +02:00 committed by Jeremy Allison
parent daf6f2f7a1
commit 95fd166eff
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/dir.c
View File

@ -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)) {

1
source3/smbd/proto.h
View File

@ -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);

6
source3/smbd/vfs.c
View File

@ -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);