From 7752df41b7447e0e9aeb4c6b339997499bde58bd Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 10 Nov 2005 03:00:38 +0000 Subject: [PATCH] Compute the right checksum length for the current protocol_version only once instead of over and over again. --- flist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flist.c b/flist.c index 1bc25bc2..3e7481f3 100644 --- a/flist.c +++ b/flist.c @@ -68,6 +68,7 @@ extern struct filter_list_struct filter_list; extern struct filter_list_struct server_filter_list; int io_error; +int checksum_len; dev_t filesystem_dev; /* used to implement -x */ static char empty_sum[MD4_SUM_LENGTH]; @@ -84,6 +85,7 @@ void init_flist(void) /* Figure out how big the file_struct is without trailing padding */ file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags; + checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; } static int show_filelist_p(void) @@ -475,14 +477,13 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags) if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) { char *sum; - int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; if (S_ISREG(mode)) sum = file->u.sum; else { /* Prior to 28, we sent a useless set of nulls. */ sum = empty_sum; } - write_buf(f, sum, slen); + write_buf(f, sum, checksum_len); } strlcpy(lastname, fname, MAXPATHLEN); @@ -698,7 +699,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist, if (always_checksum && (sum_len || protocol_version < 28)) { char *sum; - int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH; if (sum_len) { file->u.sum = sum = bp; /*bp += sum_len;*/ @@ -706,7 +706,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, /* Prior to 28, we get a useless set of nulls. */ sum = empty_sum; } - read_buf(f, sum, slen); + read_buf(f, sum, checksum_len); } if (!preserve_perms) { -- 2.34.1