You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/27 21:11:42 UTC

svn commit: r1582455 - /subversion/trunk/subversion/svnlook/svnlook.c

Author: rhuijben
Date: Thu Mar 27 20:11:41 2014
New Revision: 1582455

URL: http://svn.apache.org/r1582455
Log:
* subversion/svnlook/svnlook.c
  (print_diff_tree): Enable cancellation support when outputting a unified
    diff and thereby resolve an obsolete function usage warning.

Modified:
    subversion/trunk/subversion/svnlook/svnlook.c

Modified: subversion/trunk/subversion/svnlook/svnlook.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1582455&r1=1582454&r2=1582455&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/svnlook.c (original)
+++ subversion/trunk/subversion/svnlook/svnlook.c Thu Mar 27 20:11:41 2014
@@ -1058,11 +1058,12 @@ print_diff_tree(svn_stream_t *out_stream
                     SVN_ERR(generate_label(&orig_label, base_root,
                                            base_path, pool));
                   SVN_ERR(generate_label(&new_label, root, path, pool));
-                  SVN_ERR(svn_diff_file_output_unified3
-                          (out_stream, diff, orig_path, new_path,
+                  SVN_ERR(svn_diff_file_output_unified4(
+                           out_stream, diff, orig_path, new_path,
                            orig_label, new_label,
                            svn_cmdline_output_encoding(pool), NULL,
-                           opts->show_c_function, pool));
+                           opts->show_c_function, 
+                           check_cancel, NULL, pool));
                   SVN_ERR(svn_stream_printf_from_utf8(out_stream, encoding, pool,
                                                       "\n"));
                   diff_header_printed = TRUE;