Fixed compilation errors/warnings.

[rsync/rsync-patches.git] / detect-renamed.diff

diff --git a/detect-renamed.diff b/detect-renamed.diff
index b861477..954dfad 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -42,7 +42,7 @@ TODO:
  extern int make_backups;
  extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
  extern char *backup_dir, *backup_suffix;
-@@ -225,7 +226,7 @@ void setup_protocol(int f_out,int f_in)
+@@ -221,7 +222,7 @@ void setup_protocol(int f_out,int f_in)
        } else if (protocol_version >= 30) {
                if (recurse && allow_inc_recurse
                 && !delete_before && !delete_after && !delay_updates
@@ -121,8 +121,8 @@ TODO:
                rprintf(FINFO, "send_file_list done\n");
  
 +      if (detect_renamed) {
-+              int j = flist->count;
-+              the_fattr_list.count = j;
++              int j = flist->used;
++              the_fattr_list.used = j;
 +              the_fattr_list.files = new_array(struct file_struct *, j);
 +              if (!the_fattr_list.files)
 +                      out_of_memory("recv_file_list");
@@ -486,7 +486,7 @@ TODO:
                rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
  
 +      if (detect_renamed) {
-+              delayed_bits = bitbag_create(cur_flist->count);
++              delayed_bits = bitbag_create(cur_flist->used);
 +              if (!delete_before && !delete_during)
 +                      delete_during = -1;
 +      }