Avoid a compiler warnings about a signed/unsigned mismatch.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index 787e289..f5cfbd4 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -52,7 +52,7 @@ extern char *partial_dir;
 extern char *dest_option;
 extern char *files_from;
 extern char *filesfrom_host;
-extern struct filter_list_struct filter_list;
+extern filter_rule_list filter_list;
 extern int need_unsorted_flist;
 #ifdef ICONV_OPTION
 extern iconv_t ic_send, ic_recv;
@@ -248,15 +248,16 @@ void setup_protocol(int f_out,int f_in)
                int compat_flags;
                if (am_server) {
                        compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
-#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+#ifdef CAN_SET_SYMLINK_TIMES
                        compat_flags |= CF_SYMLINK_TIMES;
 #endif
 #ifdef ICONV_OPTION
                        compat_flags |= CF_SYMLINK_ICONV;
 #endif
                        write_byte(f_out, compat_flags);
-               } else
+               } else {
                        compat_flags = read_byte(f_in);
+               }
                /* The inc_recurse var MUST be set to 0 or 1. */
                inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
                if (am_sender) {
@@ -264,7 +265,7 @@ void setup_protocol(int f_out,int f_in)
                            ? strchr(client_info, 'L') != NULL
                            : !!(compat_flags & CF_SYMLINK_TIMES);
                }
-#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+#ifdef CAN_SET_SYMLINK_TIMES
                else
                        receiver_symlink_times = 1;
 #endif
@@ -281,7 +282,7 @@ void setup_protocol(int f_out,int f_in)
                        exit_cleanup(RERR_SYNTAX);
                }
                need_messages_from_generator = 1;
-#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+#ifdef CAN_SET_SYMLINK_TIMES
        } else if (!am_sender) {
                receiver_symlink_times = 1;
 #endif
@@ -294,7 +295,7 @@ void setup_protocol(int f_out,int f_in)
                int rflags = FILTRULE_NO_PREFIXES | FILTRULE_DIRECTORY;
                if (!am_sender || protocol_version >= 30)
                        rflags |= FILTRULE_PERISHABLE;
-               parse_rule(&filter_list, partial_dir, rflags, 0);
+               parse_filter_str(&filter_list, partial_dir, rule_template(rflags), 0);
        }