Changed f_name() to new syntax.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 7ba9fcc..68b0aaa 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -68,9 +68,9 @@ See the file "instructions" (after applying this patch) for more info.
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
---- orig/configure.in  2006-01-14 08:14:30
+--- orig/configure.in  2006-01-15 14:52:33
 +++ configure.in       2005-09-24 18:38:47
-@@ -546,6 +546,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -552,6 +552,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -652,7 +652,7 @@ See the file "instructions" (after applying this patch) for more info.
 +              return;
 +
 +      if (db_handle != NULL) {
-+              strFileNamePtr = f_name(file);
++              strFileNamePtr = f_name(file, NULL);
 +              if (am_sender && file->dir.root) {
 +                      pathjoin(strFileName, sizeof strFileName,
 +                               file->dir.root, strFileNamePtr);
@@ -1046,9 +1046,9 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_BOOL(lp_list, list)
---- orig/log.c 2006-01-14 08:14:30
+--- orig/log.c 2006-01-17 02:16:40
 +++ log.c      2005-09-23 16:01:13
-@@ -88,7 +88,7 @@ struct {
+@@ -87,7 +87,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1057,7 +1057,7 @@ See the file "instructions" (after applying this patch) for more info.
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c        2006-01-14 08:14:30
+--- orig/main.c        2006-01-15 14:46:15
 +++ main.c     2005-09-23 16:01:22
 @@ -159,6 +159,9 @@ static void handle_stats(int f)
  
@@ -1069,7 +1069,7 @@ See the file "instructions" (after applying this patch) for more info.
                if (f == -1 || !am_sender)
                        return;
        }
---- orig/receiver.c    2006-01-14 08:14:31
+--- orig/receiver.c    2006-01-14 20:27:09
 +++ receiver.c 2006-01-14 08:27:51
 @@ -174,6 +174,10 @@ static int get_tmpname(char *fnametmp, c
  
@@ -1213,7 +1213,7 @@ See the file "instructions" (after applying this patch) for more info.
                        }
                        if (!phase) {
                                SIVAL(numbuf, 0, i);
---- orig/sender.c      2006-01-14 08:14:31
+--- orig/sender.c      2006-01-14 20:27:10
 +++ sender.c   2005-09-23 16:01:44
 @@ -352,6 +352,9 @@ void send_files(struct file_list *flist,