Optimized away a call to cmp_modtime() for a compare-dest file.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index a804ca9..84958b8 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -60,9 +60,8 @@ extern struct exclude_list_struct server_exclude_list;
 /* choose whether to skip a particular file */
 static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
 {
-       if (st->st_size != file->length) {
+       if (st->st_size != file->length)
                return 0;
-       }
        if (link_dest) {
                if (preserve_perms
                    && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
@@ -94,15 +93,13 @@ static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
                                                        : MD4_SUM_LENGTH) == 0;
        }
 
-       if (size_only) {
+       if (size_only)
                return 1;
-       }
 
-       if (ignore_times) {
+       if (ignore_times)
                return 0;
-       }
 
-       return (cmp_modtime(st->st_mtime,file->modtime) == 0);
+       return cmp_modtime(st->st_mtime, file->modtime) == 0;
 }
 
 
@@ -485,7 +482,8 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
                return;
        }
 
-       if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
+       if (update_only && fnamecmp == fname
+           && cmp_modtime(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)
                        rprintf(FINFO,"%s is newer\n",fname);
                return;