summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-04-15 16:54:20 -0700
committerDavid Disseldorp <ddiss@samba.org>2013-04-16 12:05:13 +0200
commitf340795144348533912dc0a2c33286b48213f790 (patch)
treea17029c6f1b4ce91ed06329b9f61e4dd0862086a
parentb08c0b317cb8064aac5cc32774a52243aa4af973 (diff)
downloadsamba-f340795144348533912dc0a2c33286b48213f790.tar.gz
samba-f340795144348533912dc0a2c33286b48213f790.tar.bz2
samba-f340795144348533912dc0a2c33286b48213f790.zip
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
-rw-r--r--source3/smbd/dir.c13
-rw-r--r--source3/smbd/proto.h2
2 files changed, 3 insertions, 12 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 00c33d6ec2..a21a33ee47 100644
--- 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)
/****************************************************************************
@@ -888,15 +890,6 @@ bool dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, S
}
/****************************************************************************
- 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.
****************************************************************************/
void dptr_init_search_op(struct dptr_struct *dptr)
@@ -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 2be73a24d8..6d5bdba1e4 100644
--- 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);