diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-28 13:18:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 02:39:09 +0200 |
| commit | 2320b2144fcb1236c082278444e3c6df998e17ec (patch) | |
| tree | 879bb402bca2d44eba5eb1571b2631c1830e6e72 /source3/modules/vfs_dirsort.c | |
| parent | 6edd8e95f1ed0ac398c84e4050357097087ae15f (diff) | |
| download | samba-2320b2144fcb1236c082278444e3c6df998e17ec.tar.gz samba-2320b2144fcb1236c082278444e3c6df998e17ec.tar.bz2 samba-2320b2144fcb1236c082278444e3c6df998e17ec.zip | |
build: Remove SMB_STRUCT_DIRENT define
Diffstat (limited to 'source3/modules/vfs_dirsort.c')
| -rw-r--r-- | source3/modules/vfs_dirsort.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c index 1c7aaba640..7067a5892b 100644 --- a/source3/modules/vfs_dirsort.c +++ b/source3/modules/vfs_dirsort.c @@ -22,14 +22,14 @@ #include "smbd/smbd.h" #include "system/filesys.h" -static int compare_dirent (const SMB_STRUCT_DIRENT *da, const SMB_STRUCT_DIRENT *db) +static int compare_dirent (const struct dirent *da, const struct dirent *db) { return strcasecmp_m(da->d_name, db->d_name); } struct dirsort_privates { long pos; - SMB_STRUCT_DIRENT *directory_list; + struct dirent *directory_list; long number_of_entries; time_t mtime; SMB_STRUCT_DIR *source_directory; @@ -47,7 +47,7 @@ static void free_dirsort_privates(void **datap) { static bool open_and_sort_dir (vfs_handle_struct *handle) { - SMB_STRUCT_DIRENT *dp; + struct dirent *dp; struct stat dir_stat; long current_pos; struct dirsort_privates *data = NULL; @@ -72,8 +72,8 @@ static bool open_and_sort_dir (vfs_handle_struct *handle) /* Set up an array and read the directory entries into it */ SAFE_FREE(data->directory_list); /* destroy previous cache if needed */ - data->directory_list = (SMB_STRUCT_DIRENT *)SMB_MALLOC( - data->number_of_entries * sizeof(SMB_STRUCT_DIRENT)); + data->directory_list = (struct dirent *)SMB_MALLOC( + data->number_of_entries * sizeof(struct dirent)); if (!data->directory_list) { return false; } @@ -166,7 +166,7 @@ static SMB_STRUCT_DIR *dirsort_fdopendir(vfs_handle_struct *handle, return data->source_directory; } -static SMB_STRUCT_DIRENT *dirsort_readdir(vfs_handle_struct *handle, +static struct dirent *dirsort_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, SMB_STRUCT_STAT *sbuf) { |