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_scannedonly.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_scannedonly.c')
| -rw-r--r-- | source3/modules/vfs_scannedonly.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c index fcd2ed0a1c..080e88c47e 100644 --- a/source3/modules/vfs_scannedonly.c +++ b/source3/modules/vfs_scannedonly.c @@ -446,7 +446,7 @@ static bool scannedonly_allow_access(vfs_handle_struct * handle, /* check the rest of the directory and notify the scanner if some file needs scanning */ long offset; - SMB_STRUCT_DIRENT *dire; + struct dirent *dire; offset = SMB_VFS_NEXT_TELLDIR(handle, sDIR->DIR); dire = SMB_VFS_NEXT_READDIR(handle, sDIR->DIR, NULL); @@ -560,17 +560,17 @@ static SMB_STRUCT_DIR *scannedonly_fdopendir(vfs_handle_struct * handle, } -static SMB_STRUCT_DIRENT *scannedonly_readdir(vfs_handle_struct *handle, +static struct dirent *scannedonly_readdir(vfs_handle_struct *handle, SMB_STRUCT_DIR * dirp, SMB_STRUCT_STAT *sbuf) { - SMB_STRUCT_DIRENT *result; + struct dirent *result; int allowed = 0; char *tmp; struct smb_filename *smb_fname; char *notify_name; int namelen; - SMB_STRUCT_DIRENT *newdirent; + struct dirent *newdirent; TALLOC_CTX *ctx=talloc_tos(); struct scannedonly_DIR *sDIR = (struct scannedonly_DIR *)dirp; @@ -634,12 +634,12 @@ static SMB_STRUCT_DIRENT *scannedonly_readdir(vfs_handle_struct *handle, ctx,"%s %s",result->d_name, STRUCTSCANO(handle->data)->scanning_message); namelen = strlen(notify_name); - newdirent = (SMB_STRUCT_DIRENT *)talloc_array( - ctx, char, sizeof(SMB_STRUCT_DIRENT) + namelen + 1); + newdirent = (struct dirent *)talloc_array( + ctx, char, sizeof(struct dirent) + namelen + 1); if (!newdirent) { return NULL; } - memcpy(newdirent, result, sizeof(SMB_STRUCT_DIRENT)); + memcpy(newdirent, result, sizeof(struct dirent)); memcpy(&newdirent->d_name, notify_name, namelen + 1); DEBUG(SCANNEDONLY_DEBUG, ("scannedonly_readdir, return newdirent at %p with " @@ -860,7 +860,7 @@ static int scannedonly_rmdir(vfs_handle_struct * handle, const char *path) /* if there are only .scanned: .virus: or .failed: files, we delete those, because the client cannot see them */ DIR *dirp; - SMB_STRUCT_DIRENT *dire; + struct dirent *dire; TALLOC_CTX *ctx = talloc_tos(); bool only_deletable_files = true, have_files = false; char *path_w_slash; |