[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  62427861 A few superficial tweaks.
      from  b430ceec Use a varint to send the file-list flags

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


- Log -----------------------------------------------------------------
commit 6242786158d8d29a168292ce4fead19f4c8d28d2
Author: Wayne Davison <wayne at opencoder.net>
Date:   Wed Apr 29 19:28:23 2020 -0700

    A few superficial tweaks.

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

Summary of changes:
 flist.c | 4 ++--
 io.c    | 6 +++---
 rsync.h | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/flist.c b/flist.c
index f95889e9..1f2b278d 100644
--- a/flist.c
+++ b/flist.c
@@ -2037,9 +2037,9 @@ void send_extra_file_list(int f, int at_least)
 
 		if (io_error == save_io_error || ignore_errors)
 			write_end_of_flist(f, 0);
-		else if (use_safe_inc_flist) {
+		else if (use_safe_inc_flist)
 			write_end_of_flist(f, 1);
-		} else {
+		else {
 			if (delete_during)
 				fatal_unsafe_io_error();
 			write_end_of_flist(f, 0);
diff --git a/io.c b/io.c
index 19ed388d..c6d2023c 100644
--- a/io.c
+++ b/io.c
@@ -2013,13 +2013,13 @@ void write_varint(int f, int32 x)
 {
 	char b[5];
 	uchar bit;
-	int cnt = 4;
+	int cnt;
 
 	SIVAL(b, 1, x);
 
-	while (cnt > 1 && b[cnt] == 0)
-		cnt--;
+	for (cnt = 4; cnt > 1 && b[cnt] == 0; cnt--) {}
 	bit = ((uchar)1<<(7-cnt+1));
+
 	if (CVAL(b, cnt) >= bit) {
 		cnt++;
 		*b = ~(bit-1);
diff --git a/rsync.h b/rsync.h
index 29012d95..da72dc99 100644
--- a/rsync.h
+++ b/rsync.h
@@ -64,11 +64,12 @@
 #define XMIT_IO_ERROR_ENDLIST (1<<12)	/* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
 #define XMIT_MOD_NSEC (1<<13)		/* protocols 31 - now */
 #define XMIT_SAME_ATIME (1<<14) 	/* any protocol - restricted by command-line option */
-#define XMIT_RESERVED_15 (1<<15) 	/* reserved for future use */
+#define XMIT_UNUSED_15 (1<<15)  	/* unused flag bit */
 
 /* The following XMIT flags require an rsync that uses a varint for the flag values */
 
-#define XMIT_RESERVED_16 (1<<16) 	/* reserved for future use */
+#define XMIT_RESERVED_16 (1<<16) 	/* reserved for future fileflags use */
+#define XMIT_RESERVED_17 (1<<17) 	/* reserved for future crtimes use */
 
 /* These flags are used in the live flist data. */
 


-- 
The rsync repository.