Fixed failing hunks.

[rsync-patches.git] / ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 9449ee9ceb9c946cd7fa4520ce3d9bfc515c8f25..86f091d10bbb603259a7fbe4ca24861917dd9808 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -137,7 +137,7 @@ This patch adds the following options:
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
---- orig/configure.in  2005-02-25 18:44:31
+--- orig/configure.in  2005-03-01 15:57:00
 +++ configure.in       2004-07-03 20:22:18
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
@@ -686,7 +686,7 @@ This patch adds the following options:
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
---- orig/log.c 2005-02-26 05:22:50
+--- orig/log.c 2005-03-05 00:25:25
 +++ log.c      2004-07-03 20:22:18
 @@ -81,7 +81,7 @@ struct {
  /*
@@ -697,9 +697,9 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2005-03-01 03:39:47
+--- orig/main.c        2005-03-05 00:25:25
 +++ main.c     2004-07-03 20:22:18
-@@ -138,6 +138,9 @@ static void report(int f)
+@@ -139,6 +139,9 @@ static void report(int f)
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
@@ -709,24 +709,24 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2005-02-26 19:27:54
-+++ receiver.c 2005-02-16 15:40:15
-@@ -607,6 +607,9 @@ int recv_files(int f_in, struct file_lis
+--- orig/receiver.c    2005-03-05 00:25:25
++++ receiver.c 2005-03-05 00:31:00
+@@ -568,6 +568,9 @@ int recv_files(int f_in, struct file_lis
  
                if (!log_before_transfer)
-                       log_recv(file, &initial_stats, iflags);
+                       log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats, "receive");
 +#endif
  
                if (fd1 != -1)
                        close(fd1);
---- orig/sender.c      2005-02-26 03:22:59
-+++ sender.c   2005-02-16 15:40:44
-@@ -301,6 +301,9 @@ void send_files(struct file_list *flist,
+--- orig/sender.c      2005-03-05 00:25:25
++++ sender.c   2005-03-05 00:31:19
+@@ -323,6 +323,9 @@ void send_files(struct file_list *flist,
                match_sums(f_out, s, mbuf, st.st_size);
                if (!log_before_transfer)
-                       log_send(file, &initial_stats, iflags);
+                       log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats,"send");
 +#endif