sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-06 17:44:20 +03:00
Code Activity

vfs_fruit: Fix the 32-bit build

Browse Source 
On debian 32-bit, size_t is an 32 bit, but off_t is 64 bit.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri May  5 11:50:55 CEST 2017 on sn-devel-144
This commit is contained in:
Volker Lendecke
2017-04-29 12:01:41 +02:00
committed by Jeremy Allison
parent dd0d2ee1dd
commit d04efe5b9b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source3/modules/vfs_fruit.c
View File

@@ -3738,8 +3738,8 @@ static ssize_t fruit_pread(vfs_handle_struct *handle,
struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp); struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
ssize_t nread; ssize_t nread;
DBG_DEBUG("Path [%s] offset=%zd, size=%zd\n", DBG_DEBUG("Path [%s] offset=%"PRIdMAX", size=%zd\n",
fsp_str_dbg(fsp), offset, n); fsp_str_dbg(fsp), (intmax_t)offset, n);
if (fio == NULL) { if (fio == NULL) {
return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset); return SMB_VFS_NEXT_PREAD(handle, fsp, data, n, offset);
@@ -3962,8 +3962,8 @@ static ssize_t fruit_pwrite(vfs_handle_struct *handle,
struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp); struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
ssize_t nwritten; ssize_t nwritten;
DBG_DEBUG("Path [%s] offset=%zd, size=%zd\n", DBG_DEBUG("Path [%s] offset=%"PRIdMAX", size=%zd\n",
fsp_str_dbg(fsp), offset, n); fsp_str_dbg(fsp), (intmax_t)offset, n);
if (fio == NULL) { if (fio == NULL) {
return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset); return SMB_VFS_NEXT_PWRITE(handle, fsp, data, n, offset);
@@ -4407,8 +4407,8 @@ static int fruit_fstat(vfs_handle_struct *handle, files_struct *fsp,
sbuf->st_ex_blocks = sbuf->st_ex_size / STAT_ST_BLOCKSIZE + 1; sbuf->st_ex_blocks = sbuf->st_ex_size / STAT_ST_BLOCKSIZE + 1;
} }
DBG_DEBUG("Path [%s] rc [%d] size [%zd]\n", DBG_DEBUG("Path [%s] rc [%d] size [%"PRIdMAX"]\n",
fsp_str_dbg(fsp), rc, sbuf->st_ex_size); fsp_str_dbg(fsp), rc, (intmax_t)sbuf->st_ex_size);
return rc; return rc;
} }
@@ -4441,8 +4441,9 @@ static NTSTATUS fruit_streaminfo_meta_stream(
return NT_STATUS_OK; return NT_STATUS_OK;
} }
DBG_ERR("Removing invalid AFPINFO_STREAM size [%zd] from [%s]\n", DBG_ERR("Removing invalid AFPINFO_STREAM size [%"PRIdMAX"] "
stream[i].size, smb_fname_str_dbg(smb_fname)); "from [%s]\n", (intmax_t)stream[i].size,
smb_fname_str_dbg(smb_fname));
ok = del_fruit_stream(mem_ctx, pnum_streams, pstreams, AFPINFO_STREAM); ok = del_fruit_stream(mem_ctx, pnum_streams, pstreams, AFPINFO_STREAM);
if (!ok) { if (!ok) {
@@ -4909,7 +4910,8 @@ static int fruit_ftruncate(struct vfs_handle_struct *handle,
struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp); struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
int ret; int ret;
DBG_DEBUG("Path [%s] offset [%zd]\n", fsp_str_dbg(fsp), offset); DBG_DEBUG("Path [%s] offset [%"PRIdMAX"]\n", fsp_str_dbg(fsp),
(intmax_t)offset);
if (fio == NULL) { if (fio == NULL) {
return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset); return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);