summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-03-10 11:52:36 +0100
committerVolker Lendecke <vl@samba.org>2015-03-10 18:05:13 +0100
commitee087f8d6d98e033e5d1f86096a11cd46a5d543e (patch)
tree367ecd14685122e7196dc2ad80f150c55b4758bb
parentb7b508c76553448dcbf33d8779f4285d8948df64 (diff)
downloadsamba-ee087f8d6d98e033e5d1f86096a11cd46a5d543e.tar.gz
samba-ee087f8d6d98e033e5d1f86096a11cd46a5d543e.tar.xz
samba-ee087f8d6d98e033e5d1f86096a11cd46a5d543e.zip
torture4: Fix systems with a 32-bit "long"
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan (metze) Metzmacher <metze@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Tue Mar 10 18:05:13 CET 2015 on sn-devel-104
-rw-r--r--source4/torture/smb2/ioctl.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c
index 43f98be195..78bbdd9276 100644
--- a/source4/torture/smb2/ioctl.c
+++ b/source4/torture/smb2/ioctl.c
@@ -3435,9 +3435,10 @@ static bool test_ioctl_sparse_hole_dealloc(struct torture_context *torture,
* deallocation on this FS...
*/
dealloc_chunk_len = hlen;
- torture_comment(torture, "hole punch %lu@0 resulted in "
- "deallocation of %lu@0\n", hlen,
- far_rsp[0].file_off);
+ torture_comment(torture, "hole punch %ju@0 resulted in "
+ "deallocation of %ju@0\n",
+ (uintmax_t)hlen,
+ (uintmax_t)far_rsp[0].file_off);
torture_assert_u64_equal(torture,
file_size - far_rsp[0].len,
far_rsp[0].file_off,
@@ -3509,7 +3510,7 @@ static bool test_ioctl_sparse_hole_dealloc(struct torture_context *torture,
"unexpected response len");
if (far_rsp[0].file_off == dealloc_chunk_len) {
torture_comment(torture, "holes merged for deallocation of "
- "%lu chunk\n", dealloc_chunk_len);
+ "%ju chunk\n", (uintmax_t)dealloc_chunk_len);
torture_assert_u64_equal(torture,
file_size - far_rsp[0].len,
far_rsp[0].file_off,
@@ -4630,7 +4631,7 @@ static bool test_ioctl_sparse_qar_overflow(struct torture_context *torture,
/* off + length wraps around to 511 */
far_buf.file_off = 512;
- far_buf.len = (uint64_t)0xffffffffffffffff;
+ far_buf.len = 0xffffffffffffffffLL;
ndr_ret = ndr_push_struct_blob(&ioctl.smb2.in.out, tmp_ctx,
&far_buf,
(ndr_push_flags_fn_t)ndr_push_file_alloced_range_buf);