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

Fixes RewindDir(). 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 897f702328f754b59c3469d1f6ddc210a42fa597..5e991bf3317186d5b2b0a243ac84653104179d47 100644 (file)
--- 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 35f9e3def195cc01d88c2daac7f4a117f2222a2e..1bdf1b03760cc0c88a8412800ceb7195ecf26479 100644 (file)
--- 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);