diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:22:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | f6e053202481631b12d75f6a552ee1aa8b355064 (patch) | |
| tree | f029e300d5005e87774a3d1c6390423d0c09f9fd /source3/smbd | |
| parent | 2320b2144fcb1236c082278444e3c6df998e17ec (diff) | |
| download | samba-f6e053202481631b12d75f6a552ee1aa8b355064.tar.gz samba-f6e053202481631b12d75f6a552ee1aa8b355064.tar.xz samba-f6e053202481631b12d75f6a552ee1aa8b355064.zip | |
build: Remove SMB_STRUCT_DIR define
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/dir.c | 2 | ||||
| -rw-r--r-- | source3/smbd/msdfs.c | 4 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 103dbc8a33..79a0f8bf18 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -43,7 +43,7 @@ struct name_cache_entry { struct smb_Dir { connection_struct *conn; - SMB_STRUCT_DIR *dir; + DIR *dir; long offset; char *dir_path; size_t name_cache_size; diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index 7dc604c15b..b7a505284e 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -1288,7 +1288,7 @@ bool remove_msdfs_link(const struct junction_map *jucn) static int count_dfs_links(TALLOC_CTX *ctx, int snum) { size_t cnt = 0; - SMB_STRUCT_DIR *dirp = NULL; + DIR *dirp = NULL; const char *dname = NULL; char *talloced = NULL; const char *connect_path = lp_pathname(snum); @@ -1355,7 +1355,7 @@ static int form_junctions(TALLOC_CTX *ctx, size_t jn_remain) { size_t cnt = 0; - SMB_STRUCT_DIR *dirp = NULL; + DIR *dirp = NULL; const char *dname = NULL; char *talloced = NULL; const char *connect_path = lp_pathname(snum); diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index cb7d2e4496..33f2701704 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -729,7 +729,7 @@ const char *vfs_readdirname(connection_struct *conn, void *p, if (!p) return(NULL); - ptr = SMB_VFS_READDIR(conn, (SMB_STRUCT_DIR *)p, sbuf); + ptr = SMB_VFS_READDIR(conn, (DIR *)p, sbuf); if (!ptr) return(NULL); @@ -1388,7 +1388,7 @@ NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle, return handle->fns->get_dfs_referrals_fn(handle, r); } -SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle, +DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attributes) { @@ -1396,7 +1396,7 @@ SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle, return handle->fns->opendir_fn(handle, fname, mask, attributes); } -SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle, +DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *mask, uint32 attributes) @@ -1406,7 +1406,7 @@ SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle, } struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle, - SMB_STRUCT_DIR *dirp, + DIR *dirp, SMB_STRUCT_STAT *sbuf) { VFS_FIND(readdir); @@ -1414,21 +1414,21 @@ struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle, } void smb_vfs_call_seekdir(struct vfs_handle_struct *handle, - SMB_STRUCT_DIR *dirp, long offset) + DIR *dirp, long offset) { VFS_FIND(seekdir); handle->fns->seekdir_fn(handle, dirp, offset); } long smb_vfs_call_telldir(struct vfs_handle_struct *handle, - SMB_STRUCT_DIR *dirp) + DIR *dirp) { VFS_FIND(telldir); return handle->fns->telldir_fn(handle, dirp); } void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle, - SMB_STRUCT_DIR *dirp) + DIR *dirp) { VFS_FIND(rewind_dir); handle->fns->rewind_dir_fn(handle, dirp); @@ -1448,14 +1448,14 @@ int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path) } int smb_vfs_call_closedir(struct vfs_handle_struct *handle, - SMB_STRUCT_DIR *dir) + DIR *dir) { VFS_FIND(closedir); return handle->fns->closedir_fn(handle, dir); } void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle, - SMB_STRUCT_DIR *dirp) + DIR *dirp) { VFS_FIND(init_search_op); handle->fns->init_search_op_fn(handle, dirp); |