Cleanup. Remove unused function dptr_DirCacheAdd(). Make DirCacheAdd() static.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Tue Apr 16 12:05:13 CEST 2013 on sn-devel-104

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 00c33d6ec2723a5e2d98a1b07d0fd9b2ab2e227a..a21a33ee47db0efe6e0b2de0e9adf117769c5c2d 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -74,6 +74,8 @@ static struct smb_Dir *OpenDir_fsp(TALLOC_CTX *mem_ctx, connection_struct *conn,
                        const char *mask,
                        uint32 attr);
 
+static void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset);
+
 #define INVALID_DPTR_KEY (-3)
 
 /****************************************************************************
@@ -887,15 +889,6 @@ bool dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, S
        return SearchDir(dptr->dir_hnd, name, poffset);
 }
 
-/****************************************************************************
- Add the name we're returning into the underlying cache.
-****************************************************************************/
-
-void dptr_DirCacheAdd(struct dptr_struct *dptr, const char *name, long offset)
-{
-       DirCacheAdd(dptr->dir_hnd, name, offset);
-}
-
 /****************************************************************************
  Initialize variables & state data at the beginning of all search SMB requests.
 ****************************************************************************/
@@ -1680,7 +1673,7 @@ long TellDir(struct smb_Dir *dirp)
  Add an entry into the dcache.
 ********************************************************************/
 
-void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset)
+static void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset)
 {
        struct name_cache_entry *e;
 

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 2be73a24d8ff51811928d314b6e317162cdfaaeb..6d5bdba1e4bcd572669bd210ceddf96ec8aa930a 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -211,7 +211,6 @@ char *dptr_ReadDirName(TALLOC_CTX *ctx,
                        long *poffset,
                        SMB_STRUCT_STAT *pst);
 bool dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, SMB_STRUCT_STAT *pst);
-void dptr_DirCacheAdd(struct dptr_struct *dptr, const char *name, long offset);
 void dptr_init_search_op(struct dptr_struct *dptr);
 bool dptr_fill(struct smbd_server_connection *sconn,
               char *buf1,unsigned int key);
@@ -238,7 +237,6 @@ const char *ReadDirName(struct smb_Dir *dirp, long *poffset,
 void RewindDir(struct smb_Dir *dirp, long *poffset);
 void SeekDir(struct smb_Dir *dirp, long offset);
 long TellDir(struct smb_Dir *dirp);
-void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset);
 bool SearchDir(struct smb_Dir *dirp, const char *name, long *poffset);
 NTSTATUS can_delete_directory(struct connection_struct *conn,
                                const char *dirname);