diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 14:53:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-06 01:47:43 +0200 |
| commit | 6aa12fcb30c8f7246fd0215b1d808191c0d87668 (patch) | |
| tree | 92eb805ea2ed03b1e42f6ce55ca26a65a92761fb /source3/modules/vfs_time_audit.c | |
| parent | 48166468fe3ca515dae3431bbe674809489f743c (diff) | |
| download | samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.gz samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.bz2 samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.zip | |
build: Remove SMB_OFF_T, replace with off_t
Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/modules/vfs_time_audit.c')
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index ac96893cc4..a5ca407673 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -501,7 +501,7 @@ static ssize_t smb_time_audit_read(vfs_handle_struct *handle, static ssize_t smb_time_audit_pread(vfs_handle_struct *handle, files_struct *fsp, - void *data, size_t n, SMB_OFF_T offset) + void *data, size_t n, off_t offset) { ssize_t result; struct timespec ts1,ts2; @@ -542,7 +542,7 @@ static ssize_t smb_time_audit_write(vfs_handle_struct *handle, static ssize_t smb_time_audit_pwrite(vfs_handle_struct *handle, files_struct *fsp, const void *data, size_t n, - SMB_OFF_T offset) + off_t offset) { ssize_t result; struct timespec ts1,ts2; @@ -560,11 +560,11 @@ static ssize_t smb_time_audit_pwrite(vfs_handle_struct *handle, return result; } -static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle, +static off_t smb_time_audit_lseek(vfs_handle_struct *handle, files_struct *fsp, - SMB_OFF_T offset, int whence) + off_t offset, int whence) { - SMB_OFF_T result; + off_t result; struct timespec ts1,ts2; double timediff; @@ -582,7 +582,7 @@ static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle, static ssize_t smb_time_audit_sendfile(vfs_handle_struct *handle, int tofd, files_struct *fromfsp, - const DATA_BLOB *hdr, SMB_OFF_T offset, + const DATA_BLOB *hdr, off_t offset, size_t n) { ssize_t result; @@ -603,7 +603,7 @@ static ssize_t smb_time_audit_sendfile(vfs_handle_struct *handle, int tofd, static ssize_t smb_time_audit_recvfile(vfs_handle_struct *handle, int fromfd, files_struct *tofsp, - SMB_OFF_T offset, + off_t offset, size_t n) { ssize_t result; @@ -909,7 +909,7 @@ static int smb_time_audit_ntimes(vfs_handle_struct *handle, static int smb_time_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp, - SMB_OFF_T len) + off_t len) { int result; struct timespec ts1,ts2; @@ -930,8 +930,8 @@ static int smb_time_audit_ftruncate(vfs_handle_struct *handle, static int smb_time_audit_fallocate(vfs_handle_struct *handle, files_struct *fsp, enum vfs_fallocate_mode mode, - SMB_OFF_T offset, - SMB_OFF_T len) + off_t offset, + off_t len) { int result; struct timespec ts1,ts2; @@ -950,7 +950,7 @@ static int smb_time_audit_fallocate(vfs_handle_struct *handle, } static bool smb_time_audit_lock(vfs_handle_struct *handle, files_struct *fsp, - int op, SMB_OFF_T offset, SMB_OFF_T count, + int op, off_t offset, off_t count, int type) { bool result; @@ -1012,7 +1012,7 @@ static int smb_time_audit_linux_setlease(vfs_handle_struct *handle, static bool smb_time_audit_getlock(vfs_handle_struct *handle, files_struct *fsp, - SMB_OFF_T *poffset, SMB_OFF_T *pcount, + off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid) { bool result; |