summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-03-23 17:26:57 +1030
committerRusty Russell <rusty@rustcorp.com.au>2013-03-23 17:26:57 +1030
commitfd6d0361d6fef5f8175967ddbae4a2b1d79dfcad (patch)
tree5e97a1803635d8fb5dec4db85c9c8c5450678d17
parent12ebb1ba1599dd30db9376a64530667656b803b8 (diff)
downloadsamba-fd6d0361d6fef5f8175967ddbae4a2b1d79dfcad.tar.gz
samba-fd6d0361d6fef5f8175967ddbae4a2b1d79dfcad.tar.bz2
samba-fd6d0361d6fef5f8175967ddbae4a2b1d79dfcad.zip
vfs_btrfs: fix compile on 32-bit platforms.
uint64_t are not unsigned longs on 32-bit platforms: [3265/3996] Compiling source3/modules/vfs_btrfs.c ../source3/modules/vfs_btrfs.c: In function ‘btrfs_copy_chunk_send’: ../source3/modules/vfs_btrfs.c:118:3: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format] ../source3/modules/vfs_btrfs.c:118:3: error: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘int64_t’ [-Werror=format] ../source3/modules/vfs_btrfs.c:118:3: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘uint64_t’ [-Werror=format] ../source3/modules/vfs_btrfs.c:118:3: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 7 has type ‘uint64_t’ [-Werror=format] ../source3/modules/vfs_btrfs.c: In function ‘btrfs_copy_chunk_recv’: ../source3/modules/vfs_btrfs.c:180:2: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘off_t’ [-Werror=format] cc1: some warnings being treated as errors Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--source3/modules/vfs_btrfs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
index 660bc68063..eed5456021 100644
--- a/source3/modules/vfs_btrfs.c
+++ b/source3/modules/vfs_btrfs.c
@@ -117,9 +117,9 @@ static struct tevent_req *btrfs_copy_chunk_send(struct vfs_handle_struct *handle
*/
DEBUG(5, ("BTRFS_IOC_CLONE_RANGE failed: %s, length %lu, "
"src fd: %ld off: %lu, dest fd: %d off: %lu\n",
- strerror(errno), cr_args.src_length,
- cr_args.src_fd, cr_args.src_offset,
- dest_fsp->fh->fd, cr_args.dest_offset));
+ strerror(errno), (long)cr_args.src_length,
+ (long)cr_args.src_fd, (long)cr_args.src_offset,
+ dest_fsp->fh->fd, (long)cr_args.dest_offset));
cc_state->subreq = SMB_VFS_NEXT_COPY_CHUNK_SEND(handle,
cc_state, ev,
src_fsp,
@@ -177,7 +177,8 @@ static NTSTATUS btrfs_copy_chunk_recv(struct vfs_handle_struct *handle,
return status;
}
- DEBUG(10, ("server side copy chunk copied %lu\n", cc_state->copied));
+ DEBUG(10, ("server side copy chunk copied %lu\n",
+ (long)cc_state->copied));
*copied = cc_state->copied;
tevent_req_received(req);
return NT_STATUS_OK;