X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/cd87e2f59abe075139af21039dd857fd90849fa5..4ea4acf17ba245e64a0d549e030fa9def99750ea:/flist.c

diff --git a/flist.c b/flist.c
index 8e543a63..5b80f3e1 100644
--- a/flist.c
+++ b/flist.c
@@ -455,8 +455,8 @@ static void send_file_entry(struct file_struct *file, int f)
 	if (file->link_u.idev) {
 		if (protocol_version < 26) {
 			/* 32-bit dev_t and ino_t */
-			write_int(f, dev);
-			write_int(f, file->F_INODE);
+			write_int(f, (int32)dev);
+			write_int(f, (int32)file->F_INODE);
 		} else {
 			/* 64-bit dev_t and ino_t */
 			if (!(flags & XMIT_SAME_DEV))
@@ -467,7 +467,7 @@ static void send_file_entry(struct file_struct *file, int f)
 #endif
 
 	if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
-		char *sum;
+		const char *sum;
 		if (S_ISREG(mode))
 			sum = file->u.sum;
 		else {
@@ -1450,10 +1450,10 @@ int flist_find(struct file_list *flist, struct file_struct *f)
 			if (mid_up > high) {
 				/* If there's nothing left above us, set high to
 				 * a non-empty entry below us and continue. */
-				high = mid - flist->files[mid]->length;
+				high = mid - (int)flist->files[mid]->length;
 				if (!flist->files[high]->basename) {
 					do {
-					    high -= flist->files[high]->length;
+					    high -= (int)flist->files[high]->length;
 					} while (!flist->files[high]->basename);
 					flist->files[mid]->length = mid - high;
 				}
@@ -1505,8 +1505,7 @@ struct file_list *flist_new(int with_hlink, char *msg)
 
 	memset(flist, 0, sizeof (struct file_list));
 
-	if (!(flist->file_pool = pool_create(FILE_EXTENT, 0,
-	    out_of_memory, POOL_INTERN)))
+	if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
 		out_of_memory(msg);
 
 #ifdef SUPPORT_HARD_LINKS