You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2017/09/19 15:58:52 UTC
svn commit: r1808905 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: brane
Date: Tue Sep 19 15:58:52 2017
New Revision: 1808905
URL: http://svn.apache.org/viewvc?rev=1808905&view=rev
Log:
Fix local variable type mismatch from r1808258.
* subversion/libsvn_client/conflicts.c
(find_nearest_yca): Change types of c1 and c2 to apr_size_t.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1808905&r1=1808904&r2=1808905&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Sep 19 15:58:52 2017
@@ -514,7 +514,7 @@ find_nearest_yca(svn_client__pathrev_t *
svn_error_t *err;
apr_pool_t *iterpool;
const char *p1, *p2;
- int c1, c2;
+ apr_size_t c1, c2;
*yca_locp = NULL;
@@ -551,10 +551,10 @@ find_nearest_yca(svn_client__pathrev_t *
return SVN_NO_ERROR;
}
- p2 = svn_relpath_dirname(p2, scratch_pool);
+ p2 = svn_relpath_dirname(p2, scratch_pool);
}
- p1 = svn_relpath_dirname(p1, scratch_pool);
+ p1 = svn_relpath_dirname(p1, scratch_pool);
}
svn_pool_destroy(iterpool);