From 4499c0eebd4facb0a71fe990cf75a0213460d813 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 9 Jan 2004 18:10:31 +0000 Subject: [PATCH] A couple minor code improvements. --- generator.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/generator.c b/generator.c index c388537c..7c818743 100644 --- a/generator.c +++ b/generator.c @@ -78,11 +78,8 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st) } } file_checksum(fname,sum,st->st_size); - if (protocol_version < 21) { - return (memcmp(sum,file->sum,2) == 0); - } else { - return (memcmp(sum,file->sum,MD4_SUM_LENGTH) == 0); - } + return memcmp(sum, file->sum, protocol_version < 21? 2 + : MD4_SUM_LENGTH) == 0; } if (size_only) { @@ -525,7 +522,6 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out) } - void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) { int i; @@ -580,7 +576,7 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) /* files can cycle through the system more than once * to catch initial checksum errors */ - for (i = read_int(f_recv); i != -1; i = read_int(f_recv)) { + while ((i = read_int(f_recv)) != -1) { struct file_struct *file = flist->files[i]; recv_generator(local_name? local_name : f_name_to(file,fbuf,sizeof fbuf), file, i, f); -- 2.34.1