Got rid of fuzz.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 408894c..f72c04a 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -99,9 +99,9 @@ This patch adds the following options:
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
---- orig/cleanup.c     2004-07-02 18:11:26
+--- orig/cleanup.c     2004-07-20 21:36:07
 +++ cleanup.c  2004-07-03 20:22:18
-@@ -141,8 +141,12 @@ void _exit_cleanup(int code, const char 
+@@ -138,8 +138,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
        }
  
@@ -115,7 +115,7 @@ This patch adds the following options:
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c        2004-07-15 02:21:10
+--- orig/clientserver.c        2004-07-17 15:20:05
 +++ clientserver.c     2004-07-03 20:22:18
 @@ -316,6 +316,9 @@ static int rsync_module(int f_in, int f_
        exclude_path_prefix = NULL;
@@ -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  2004-04-30 18:04:07
+--- orig/configure.in  2004-07-16 20:07:22
 +++ 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)],
@@ -697,7 +697,7 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2004-07-15 17:02:03
+--- orig/main.c        2004-07-19 17:14:44
 +++ main.c     2004-07-03 20:22:18
 @@ -134,6 +134,9 @@ static void report(int f)
  
@@ -709,22 +709,21 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2004-07-14 17:12:06
-+++ receiver.c 2004-07-03 20:22:18
-@@ -460,7 +460,9 @@ int recv_files(int f_in, struct file_lis
-               recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
+--- orig/receiver.c    2004-07-20 21:36:07
++++ receiver.c 2004-07-20 21:47:47
+@@ -512,6 +512,9 @@ int recv_files(int f_in, struct file_lis
+                                      fname, fd2, file->length);
  
                log_recv(file, &initial_stats);
--
 +#ifdef HAVE_LIBODBC
 +              db_log_transfer(file, &initial_stats, "receive");
 +#endif
-               if (mapbuf)
-                       unmap_file(mapbuf);
+ 
                if (fd1 != -1)
---- orig/sender.c      2004-07-15 02:21:11
+                       close(fd1);
+--- orig/sender.c      2004-07-20 21:36:08
 +++ sender.c   2004-07-15 02:37:48
-@@ -229,6 +229,9 @@ void send_files(struct file_list *flist,
+@@ -230,6 +230,9 @@ void send_files(struct file_list *flist,
  
                match_sums(f_out, s, mbuf, st.st_size);
                log_send(file, &initial_stats);