Author: rhuijben
Date: Sat Feb 21 01:53:16 2015
New Revision: 1661267
URL: http://svn.apache.org/r1661267
Log:
* subversion/libsvn_client/client.h
(svn_client__sort_commit_item_urls): Remove function here.
* subversion/libsvn_client/commit_util.c
(svn_client__sort_commit_item_urls): Make static and rename to...
(sort_commit_item_urls): ... this.
(svn_client__condense_commit_items): Update caller.
Modified:
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1661267&r1=1661266&r2=1661267&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Sat Feb 21 01:53:16 2015
@@ -948,11 +948,6 @@ svn_client__get_copy_committables(svn_cl
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* A qsort()-compatible sort routine for sorting an array of
- svn_client_commit_item_t *'s by their URL member. */
-int svn_client__sort_commit_item_urls(const void *a, const void *b);
-
-
/* Rewrite the COMMIT_ITEMS array to be sorted by URL. Also, discover
a common *BASE_URL for the items in the array, and rewrite those
items' URLs to be relative to that *BASE_URL.
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1661267&r1=1661266&r2=1661267&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Sat Feb 21 01:53:16
2015
@@ -1380,7 +1380,10 @@ svn_client__get_copy_committables(svn_cl
}
-int svn_client__sort_commit_item_urls(const void *a, const void *b)
+/* A svn_sort__array()/qsort()-compatible sort routine for sorting
+ an array of svn_client_commit_item_t *'s by their URL member. */
+static int
+sort_commit_item_urls(const void *a, const void *b)
{
const svn_client_commit_item3_t *item1
= *((const svn_client_commit_item3_t * const *) a);
@@ -1404,7 +1407,7 @@ svn_client__condense_commit_items(const
SVN_ERR_ASSERT(ci && ci->nelts);
/* Sort our commit items by their URLs. */
- svn_sort__array(ci, svn_client__sort_commit_item_urls);
+ svn_sort__array(ci, sort_commit_item_urls);
/* Loop through the URLs, finding the longest usable ancestor common
to all of them, and making sure there are no duplicate URLs. */
