[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu May 19 21:54:03 UTC 2016


The branch, master has been updated
       via  249012f vfs_fruit: Fix a few signed/unsigned mixups
       via  3c0d86e vfs_fileid: Fix a signed/unsigned mixup
      from  3aefd27 python:samba: move netcmd/time.py to python/samba/netcmd/nettime.py

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


- Log -----------------------------------------------------------------
commit 249012f3e479b6a6e96b7eda189e68ab0db3d546
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 19 18:42:04 2016 +0200

    vfs_fruit: Fix a few signed/unsigned mixups
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May 19 23:53:47 CEST 2016 on sn-devel-144

commit 3c0d86e68db0b1aafffcaaf4f6d74d65e4f41806
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 19 14:55:10 2016 +0200

    vfs_fileid: Fix a signed/unsigned mixup
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/modules/vfs_fileid.c |  2 +-
 source3/modules/vfs_fruit.c  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index 25048e7..f274059 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -100,7 +100,7 @@ nomem:
 static struct fileid_mount_entry *fileid_find_mount_entry(struct fileid_handle_data *data,
 							  SMB_DEV_T dev)
 {
-	int i;
+	unsigned i;
 
 	if (data->num_mount_entries == 0) {
 		fileid_load_mount_entries(data);
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 84c40bd..6d4389f 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -576,10 +576,11 @@ static bool ad_pack(struct adouble *ad)
 /**
  * Unpack an AppleDouble blob into a struct adoble
  **/
-static bool ad_unpack(struct adouble *ad, const int nentries, size_t filesize)
+static bool ad_unpack(struct adouble *ad, const size_t nentries,
+		      size_t filesize)
 {
 	size_t bufsize = talloc_get_size(ad->ad_data);
-	int adentries, i;
+	size_t adentries, i;
 	uint32_t eid, len, off;
 
 	/*
@@ -603,7 +604,8 @@ static bool ad_unpack(struct adouble *ad, const int nentries, size_t filesize)
 
 	adentries = RSVAL(ad->ad_data, ADEDOFF_NENTRIES);
 	if (adentries != nentries) {
-		DEBUG(1, ("invalid number of entries: %d\n", adentries));
+		DEBUG(1, ("invalid number of entries: %zu\n",
+			  adentries));
 		return false;
 	}
 
@@ -1533,7 +1535,7 @@ static bool del_fruit_stream(TALLOC_CTX *mem_ctx, unsigned int *num_streams,
 			     const char *name)
 {
 	struct stream_struct *tmp = *streams;
-	int i;
+	unsigned int i;
 
 	if (*num_streams == 0) {
 		return true;
@@ -2015,7 +2017,7 @@ static NTSTATUS check_ms_nfs(vfs_handle_struct *handle,
 			     mode_t *pmode,
 			     bool *pdo_chmod)
 {
-	int i;
+	uint32_t i;
 	struct fruit_config_data *config = NULL;
 
 	*pdo_chmod = false;
@@ -3770,7 +3772,7 @@ static void fruit_copy_chunk_done(struct tevent_req *subreq)
 	NTSTATUS status;
 	unsigned int num_streams = 0;
 	struct stream_struct *streams = NULL;
-	int i;
+	unsigned int i;
 	struct smb_filename *src_fname_tmp = NULL;
 	struct smb_filename *dst_fname_tmp = NULL;
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list