Got rid of two compiler warnings.

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 05e9a88..6c1e6f3 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,7 +365,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2005-04-09 18:00:28
+--- orig/options.c     2005-05-10 15:32:58
 +++ options.c  2005-04-09 18:01:31
 @@ -141,6 +141,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -400,7 +400,7 @@ the file's name.
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-@@ -873,6 +876,21 @@ int parse_arguments(int *argc, const cha
+@@ -882,6 +885,21 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -422,7 +422,7 @@ the file's name.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1453,6 +1471,11 @@ void server_options(char **args,int *arg
+@@ -1462,6 +1480,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -434,7 +434,7 @@ the file's name.
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
---- orig/receiver.c    2005-04-09 18:00:29
+--- orig/receiver.c    2005-04-14 01:53:12
 +++ receiver.c 2005-01-15 21:29:13
 @@ -52,6 +52,7 @@ extern int delay_updates;
  extern struct stats stats;
@@ -505,7 +505,7 @@ the file's name.
  }
  
  static void handle_delayed_updates(struct file_list *flist, char *local_name)
-@@ -634,8 +645,12 @@ int recv_files(int f_in, struct file_lis
+@@ -635,8 +646,12 @@ int recv_files(int f_in, struct file_lis
                        rprintf(FINFO, "%s\n", safe_fname(fname));
  
                /* recv file data */
@@ -543,9 +543,9 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2005-03-28 20:56:55
+--- orig/rsync.h       2005-05-03 17:11:01
 +++ rsync.h    2004-07-03 20:20:15
-@@ -632,6 +632,14 @@ struct stats {
+@@ -631,6 +631,14 @@ struct stats {
        int current_file_index;
  };
  
@@ -560,9 +560,9 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
---- orig/rsync.yo      2005-04-09 18:00:29
+--- orig/rsync.yo      2005-05-10 16:14:33
 +++ rsync.yo   2005-02-13 06:58:47
-@@ -355,6 +355,7 @@ to the detailed description below for a 
+@@ -356,6 +356,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged