Fixed failing hunks.

[rsync/rsync-patches.git] / md5.diff

diff --git a/md5.diff b/md5.diff
index 5f0d959..2e6bcb0 100644 (file)
--- a/md5.diff
+++ b/md5.diff
@@ -553,7 +553,7 @@
 +#endif /* md5.h */
 --- old/options.c
 +++ new/options.c
-@@ -116,6 +116,7 @@ int inplace = 0;
+@@ -117,6 +117,7 @@ int inplace = 0;
  int delay_updates = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */
  
@@ -561,7 +561,7 @@
  
  /** Network address family. **/
  #ifdef INET6
-@@ -367,6 +368,7 @@ void usage(enum logcode F)
+@@ -369,6 +370,7 @@ void usage(enum logcode F)
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
    rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
@@ -569,7 +569,7 @@
  #ifdef INET6
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
-@@ -473,6 +475,7 @@ static struct poptOption long_options[] 
+@@ -475,6 +477,7 @@ static struct poptOption long_options[] 
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"no-W",             0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
@@ -577,7 +577,7 @@
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
-@@ -1608,6 +1611,9 @@ void server_options(char **args,int *arg
+@@ -1610,6 +1613,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }