s3: smbd: Naming consistency. Change all uses of struct smb_Dir * variables to be...

Fixes OpenDir_internal(). No logic changes.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 0a9cb952b9d5bed20ebb0eb41a6c1c38a1155588..84f37d0e121b71c7c349741e30f68eca28e29890 100644 (file)
--- 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;
 }