From a5b876f3dbdd2dc17407ec08340b5d192b374098 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 17 Jul 2019 09:52:41 -0700 Subject: [PATCH] s3: smbd: Naming consistency. Change all uses of struct smb_Dir * variables to be dir_hnd. Fixes RewindDir(). No logic changes. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider --- source3/smbd/dir.c | 8 ++++---- source3/smbd/proto.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 897f702328f..5e991bf3317 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1845,11 +1845,11 @@ const char *ReadDirName(struct smb_Dir *dir_hnd, long *poffset, Rewind to the start. ********************************************************************/ -void RewindDir(struct smb_Dir *dirp, long *poffset) +void RewindDir(struct smb_Dir *dir_hnd, long *poffset) { - SMB_VFS_REWINDDIR(dirp->conn, dirp->dir); - dirp->file_number = 0; - dirp->offset = START_OF_DIRECTORY_OFFSET; + SMB_VFS_REWINDDIR(dir_hnd->conn, dir_hnd->dir); + dir_hnd->file_number = 0; + dir_hnd->offset = START_OF_DIRECTORY_OFFSET; *poffset = START_OF_DIRECTORY_OFFSET; } diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 35f9e3def19..1bdf1b03760 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -232,7 +232,7 @@ struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx, uint32_t attr); const char *ReadDirName(struct smb_Dir *dir_hnd, long *poffset, SMB_STRUCT_STAT *sbuf, char **talloced); -void RewindDir(struct smb_Dir *dirp, long *poffset); +void RewindDir(struct smb_Dir *dir_hnd, long *poffset); void SeekDir(struct smb_Dir *dirp, long offset); long TellDir(struct smb_Dir *dirp); bool SearchDir(struct smb_Dir *dirp, const char *name, long *poffset);