A few superficial tweaks.

This commit is contained in:
Wayne Davison
2020-04-29 19:28:23 -07:00
parent b430ceec7a
commit 6242786158
3 changed files with 8 additions and 7 deletions

View File

@@ -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);

6
io.c
View File

@@ -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);

View File

@@ -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. */