Fixed a typo in a comment and added a "void" arg-spec to the

function definition "void init_fname_convert()".

diff --git a/fname-convert.diff b/fname-convert.diff
index e63fbc3..55bc3b5 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -47,9 +47,9 @@ some utility functions.
 Note that you'll need to run 'make proto' after applying this patch.
 
 
---- orig/Makefile.in   2004-11-02 16:47:15
+--- orig/Makefile.in   2005-07-07 23:11:07
 +++ Makefile.in        2004-07-03 20:18:02
-@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
+@@ -34,7 +34,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
@@ -87,7 +87,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
---- orig/flist.c       2005-05-28 08:24:57
+--- orig/flist.c       2005-07-27 23:31:12
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -233,10 +233,10 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +/**
 + * Runs the filename converter process. Should be called before filename
-+ * conversion begins (actually it's not necessarh, but it keeps the proress report
++ * conversion begins (actually it's not necessarh, but it keeps the progress report
 + * nice and clean.
 + **/
-+void init_fname_convert()
++void init_fname_convert(void)
 +{
 +      if (fname_convert_cmd && conv_pid < 0) {
 +              char *args[MAX_ARGS];
@@ -382,9 +382,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      if (verbose > 2)
 +              rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}
---- orig/generator.c   2005-05-22 20:53:34
+--- orig/generator.c   2005-07-28 01:46:25
 +++ generator.c        2005-03-05 00:29:37
-@@ -583,7 +583,13 @@ static int phase = 0;
+@@ -593,7 +593,13 @@ static int phase = 0;
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
@@ -399,7 +399,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)
---- orig/log.c 2005-04-15 07:08:03
+--- orig/log.c 2005-06-10 21:33:28
 +++ log.c      2004-07-03 20:18:02
 @@ -65,6 +65,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
@@ -409,9 +409,9 @@ Note that you'll need to run 'make proto' after applying this patch.
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c        2005-05-12 07:51:58
+--- orig/main.c        2005-07-27 23:31:12
 +++ main.c     2004-07-22 00:31:47
-@@ -373,7 +373,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -368,7 +368,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
                ret = local_child(argc, args, f_in, f_out, child_main);
        } else
@@ -420,9 +420,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-05-19 08:52:42
+--- orig/options.c     2005-07-28 01:46:25
 +++ options.c  2005-02-14 02:50:32
-@@ -138,6 +138,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -139,6 +139,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *log_format = NULL;
@@ -430,7 +430,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
-@@ -321,6 +322,7 @@ void usage(enum logcode F)
+@@ -324,6 +325,7 @@ void usage(enum logcode F)
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
@@ -438,7 +438,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -433,6 +435,7 @@ static struct poptOption long_options[] 
+@@ -437,6 +439,7 @@ static struct poptOption long_options[] 
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
@@ -477,9 +477,9 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (pid == -1) {
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
---- orig/syscall.c     2005-04-07 17:04:26
+--- orig/syscall.c     2005-07-27 23:31:12
 +++ syscall.c  2004-07-02 21:39:00
-@@ -259,3 +259,34 @@ char *d_name(struct dirent *di)
+@@ -270,3 +270,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif
  }
@@ -514,9 +514,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
---- orig/util.c        2005-05-03 16:47:33
+--- orig/util.c        2005-07-27 23:31:12
 +++ util.c     2004-07-03 20:18:02
-@@ -1338,3 +1338,55 @@ uint32 fuzzy_distance(const char *s1, in
+@@ -1349,3 +1349,55 @@ uint32 fuzzy_distance(const char *s1, in
  
        return a[len2-1];
  }