Fixed compilation errors/warnings.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 9a9c9ae..b6b7802 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -33,7 +33,7 @@ To use this patch, run these commands for a successful build:
  
  extern char curr_dir[MAXPATHLEN];
  
-@@ -834,7 +835,7 @@ static struct file_struct *recv_file_ent
+@@ -830,7 +831,7 @@ static struct file_struct *recv_file_ent
                extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
  #endif
  
@@ -264,7 +264,7 @@ To use this patch, run these commands for a successful build:
 +}
 +
 +
-+int link_by_hash(char *fnametmp,char *fname,struct file_struct *file)
++int link_by_hash(const char *fnametmp, const char *fname, struct file_struct *file)
 +{
 +      STRUCT_STAT st;
 +      char *hashname = make_hash_name(file);
@@ -408,7 +408,7 @@ To use this patch, run these commands for a successful build:
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -558,6 +560,7 @@ static struct poptOption long_options[] 
+@@ -561,6 +563,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -416,7 +416,7 @@ To use this patch, run these commands for a successful build:
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
    {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
-@@ -1216,6 +1219,21 @@ int parse_arguments(int *argc_p, const c
+@@ -1219,6 +1222,21 @@ int parse_arguments(int *argc_p, const c
                        return 0;
  #endif
  
@@ -438,7 +438,7 @@ To use this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1954,6 +1972,11 @@ void server_options(char **args, int *ar
+@@ -1965,6 +1983,11 @@ void server_options(char **args, int *ar
        } else if (inplace)
                args[ac++] = "--inplace";
  
@@ -533,7 +533,7 @@ To use this patch, run these commands for a successful build:
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
  #ifdef ICONV_OPTION
-@@ -457,8 +458,15 @@ void finish_transfer(const char *fname, 
+@@ -529,8 +530,15 @@ void finish_transfer(const char *fname, 
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);