summaryrefslogtreecommitdiff
path: root/source3/modules/vfs_dirsort.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-28 13:22:03 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-04-05 02:39:09 +0200
commitf6e053202481631b12d75f6a552ee1aa8b355064 (patch)
treef029e300d5005e87774a3d1c6390423d0c09f9fd /source3/modules/vfs_dirsort.c
parent2320b2144fcb1236c082278444e3c6df998e17ec (diff)
downloadsamba-f6e053202481631b12d75f6a552ee1aa8b355064.tar.gz
samba-f6e053202481631b12d75f6a552ee1aa8b355064.tar.bz2
samba-f6e053202481631b12d75f6a552ee1aa8b355064.zip
build: Remove SMB_STRUCT_DIR define
Diffstat (limited to 'source3/modules/vfs_dirsort.c')
-rw-r--r--source3/modules/vfs_dirsort.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index 7067a5892b..f04f52d718 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -32,7 +32,7 @@ struct dirsort_privates {
struct dirent *directory_list;
long number_of_entries;
time_t mtime;
- SMB_STRUCT_DIR *source_directory;
+ DIR *source_directory;
int fd;
};
@@ -90,7 +90,7 @@ static bool open_and_sort_dir (vfs_handle_struct *handle)
return true;
}
-static SMB_STRUCT_DIR *dirsort_opendir(vfs_handle_struct *handle,
+static DIR *dirsort_opendir(vfs_handle_struct *handle,
const char *fname, const char *mask,
uint32 attr)
{
@@ -124,7 +124,7 @@ static SMB_STRUCT_DIR *dirsort_opendir(vfs_handle_struct *handle,
return data->source_directory;
}
-static SMB_STRUCT_DIR *dirsort_fdopendir(vfs_handle_struct *handle,
+static DIR *dirsort_fdopendir(vfs_handle_struct *handle,
files_struct *fsp,
const char *mask,
uint32 attr)
@@ -167,7 +167,7 @@ static SMB_STRUCT_DIR *dirsort_fdopendir(vfs_handle_struct *handle,
}
static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
- SMB_STRUCT_DIR *dirp,
+ DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
struct dirsort_privates *data = NULL;
@@ -195,7 +195,7 @@ static struct dirent *dirsort_readdir(vfs_handle_struct *handle,
return &data->directory_list[data->pos++];
}
-static void dirsort_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
+static void dirsort_seekdir(vfs_handle_struct *handle, DIR *dirp,
long offset)
{
struct dirsort_privates *data = NULL;
@@ -204,7 +204,7 @@ static void dirsort_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
data->pos = offset;
}
-static long dirsort_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static long dirsort_telldir(vfs_handle_struct *handle, DIR *dirp)
{
struct dirsort_privates *data = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
@@ -213,7 +213,7 @@ static long dirsort_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
return data->pos;
}
-static void dirsort_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void dirsort_rewinddir(vfs_handle_struct *handle, DIR *dirp)
{
struct dirsort_privates *data = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, return);