[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  40bcdb3 vfs_fruit: Fix the 32-bit build
      from  37e1502 ctdb-daemon: Remove control CTDB_CONTROL_SET_CALL

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 40bcdb364b99171121f763e8f30024a5c89c80fa
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jul 11 13:44:05 2015 +0200

    vfs_fruit: Fix the 32-bit build
    
    "z" is only for size_t, here we have off_t
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Jul 13 11:53:47 CEST 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_fruit.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index e29440b..8ac4ba1 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3511,8 +3511,8 @@ static struct tevent_req *fruit_copy_chunk_send(struct vfs_handle_struct *handle
 	struct fruit_config_data *config;
 	off_t to_copy = num;
 
-	DEBUG(10,("soff: %zd, doff: %zd, len: %zd\n",
-		  src_off, dest_off, num));
+	DEBUG(10,("soff: %ju, doff: %ju, len: %ju\n",
+		  (uintmax_t)src_off, (uintmax_t)dest_off, (uintmax_t)num));
 
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct fruit_config_data,
@@ -3607,8 +3607,9 @@ static void fruit_copy_chunk_done(struct tevent_req *subreq)
 	}
 
 	for (i = 0; i < num_streams; i++) {
-		DEBUG(10, ("%s: stream: '%s'/%zd\n",
-			  __func__, streams[i].name, streams[i].size));
+		DEBUG(10, ("%s: stream: '%s'/%ju\n",
+			   __func__, streams[i].name,
+			   (uintmax_t)streams[i].size));
 
 		src_fname_tmp = synthetic_smb_fname(
 			req,


-- 
Samba Shared Repository