From 8ad519c4089df71a9fc9191cead68e4eabf844f1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 17 Jul 2019 09:44:56 -0700 Subject: [PATCH] s3: smbd: Naming consistency. Change all uses of struct smb_Dir * variables to be dir_hnd. Fixes OpenDir_internal(). No logic changes. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider --- source3/smbd/dir.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 0a9cb952b9d..84f37d0e121 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -1544,22 +1544,22 @@ static struct smb_Dir *OpenDir_internal(TALLOC_CTX *mem_ctx, const char *mask, uint32_t attr) { - struct smb_Dir *dirp = talloc_zero(mem_ctx, struct smb_Dir); + struct smb_Dir *dir_hnd = talloc_zero(mem_ctx, struct smb_Dir); - if (!dirp) { + if (!dir_hnd) { return NULL; } - dirp->dir = SMB_VFS_OPENDIR(conn, smb_dname, mask, attr); + dir_hnd->dir = SMB_VFS_OPENDIR(conn, smb_dname, mask, attr); - if (!dirp->dir) { + if (!dir_hnd->dir) { DEBUG(5,("OpenDir: Can't open %s. %s\n", smb_dname->base_name, strerror(errno) )); goto fail; } - dirp->conn = conn; + dir_hnd->conn = conn; if (!conn->sconn->using_smb2) { /* @@ -1568,13 +1568,14 @@ static struct smb_Dir *OpenDir_internal(TALLOC_CTX *mem_ctx, * position (unless it's told to restart or close-and-reopen the * listing). */ - dirp->name_cache_size = lp_directory_name_cache_size(SNUM(conn)); + dir_hnd->name_cache_size = + lp_directory_name_cache_size(SNUM(conn)); } - return dirp; + return dir_hnd; fail: - TALLOC_FREE(dirp); + TALLOC_FREE(dir_hnd); return NULL; } -- 2.47.3