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_recycle.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_recycle.c')
| -rw-r--r-- | source3/modules/vfs_recycle.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 80332523ed..37d930f793 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -126,9 +126,9 @@ static const char **recycle_noversions(vfs_handle_struct *handle) return tmp_lp; } -static SMB_OFF_T recycle_maxsize(vfs_handle_struct *handle) +static off_t recycle_maxsize(vfs_handle_struct *handle) { - SMB_OFF_T maxsize; + off_t maxsize; maxsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn), "recycle", "maxsize", NULL)); @@ -138,9 +138,9 @@ static SMB_OFF_T recycle_maxsize(vfs_handle_struct *handle) return maxsize; } -static SMB_OFF_T recycle_minsize(vfs_handle_struct *handle) +static off_t recycle_minsize(vfs_handle_struct *handle) { - SMB_OFF_T minsize; + off_t minsize; minsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn), "recycle", "minsize", NULL)); @@ -225,23 +225,23 @@ static bool recycle_file_exist(vfs_handle_struct *handle, * @param fname file name * @return size in bytes **/ -static SMB_OFF_T recycle_get_file_size(vfs_handle_struct *handle, +static off_t recycle_get_file_size(vfs_handle_struct *handle, const struct smb_filename *smb_fname) { struct smb_filename *smb_fname_tmp = NULL; NTSTATUS status; - SMB_OFF_T size; + off_t size; status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp); if (!NT_STATUS_IS_OK(status)) { - size = (SMB_OFF_T)0; + size = (off_t)0; goto out; } if (SMB_VFS_STAT(handle->conn, smb_fname_tmp) != 0) { DEBUG(0,("recycle: stat for %s returned %s\n", smb_fname_str_dbg(smb_fname_tmp), strerror(errno))); - size = (SMB_OFF_T)0; + size = (off_t)0; goto out; } @@ -442,8 +442,8 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *base; char *repository = NULL; int i = 1; - SMB_OFF_T maxsize, minsize; - SMB_OFF_T file_size; /* space_avail; */ + off_t maxsize, minsize; + off_t file_size; /* space_avail; */ bool exist; NTSTATUS status; int rc = -1; |