Author: julianfoad
Date: Wed Apr 30 14:31:39 2014
New Revision: 1591315
URL: http://svn.apache.org/r1591315
Log:
* subversion/libsvn_client/mergeinfo.c
(svn_client__elide_mergeinfo): A tiny simplification: don't pass or return
arguments that we don't use.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1591315&r1=1591314&r2=1591315&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Wed Apr 30 14:31:39
2014
@@ -922,15 +922,13 @@ svn_client__elide_mergeinfo(const char *
{
svn_mergeinfo_t target_mergeinfo;
svn_mergeinfo_t mergeinfo = NULL;
- const char *walk_path;
svn_error_t *err;
/* Get the TARGET_WCPATH's explicit mergeinfo. */
err = svn_client__get_wc_mergeinfo(&target_mergeinfo, NULL,
svn_mergeinfo_explicit,
target_abspath,
- limit_abspath,
- &walk_path, FALSE,
+ NULL, NULL, FALSE,
ctx, pool, pool);
if (err)
{
@@ -958,7 +956,7 @@ svn_client__elide_mergeinfo(const char *
svn_mergeinfo_nearest_ancestor,
target_abspath,
limit_abspath,
- &walk_path, FALSE, ctx, pool, pool);
+ NULL, FALSE, ctx, pool, pool);
if (err)
{
if (err->apr_err == SVN_ERR_MERGEINFO_PARSE_ERROR)
