You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/02/23 18:11:34 UTC
svn commit: r1073831 - in /subversion/trunk/subversion/libsvn_wc:
wc_db_pdh.c wc_db_private.h
Author: hwright
Date: Wed Feb 23 17:11:34 2011
New Revision: 1073831
URL: http://svn.apache.org/viewvc?rev=1073831&view=rev
Log:
Reduce the scope of a helper function.
* subversion/libsvn_wc/wc_db_pdh.c
(svn_wc__db_pdh_compute_relpath): Rename from this...
(compute_relpath): ...to this.
(svn_wc__db_pdh_parse_local_abspath): Update caller.
* subversion/libsvn_wc/wc_db_private.h
(svn_wc__db_pdh_compute_relpath): Remove.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c
subversion/trunk/subversion/libsvn_wc/wc_db_private.h
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c?rev=1073831&r1=1073830&r2=1073831&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c Wed Feb 23 17:11:34 2011
@@ -317,9 +317,9 @@ svn_wc__db_close_many_wcroots(apr_hash_t
/* POOL may be NULL if the lifetime of LOCAL_ABSPATH is sufficient. */
-const char *
-svn_wc__db_pdh_compute_relpath(const svn_wc__db_pdh_t *pdh,
- apr_pool_t *result_pool)
+static const char *
+compute_relpath(const svn_wc__db_pdh_t *pdh,
+ apr_pool_t *result_pool)
{
const char *relpath = svn_dirent_is_child(pdh->wcroot->abspath,
pdh->local_abspath,
@@ -371,7 +371,7 @@ svn_wc__db_pdh_parse_local_abspath(svn_w
### DB->mode? (will we record per-dir mode?) */
/* ### for most callers, we could pass NULL for result_pool. */
- *local_relpath = svn_wc__db_pdh_compute_relpath(*pdh, result_pool);
+ *local_relpath = compute_relpath(*pdh, result_pool);
return SVN_NO_ERROR;
}
@@ -406,7 +406,7 @@ svn_wc__db_pdh_parse_local_abspath(svn_w
const char *dir_relpath;
/* Stashed directory's local_relpath + basename. */
- dir_relpath = svn_wc__db_pdh_compute_relpath(*pdh, NULL);
+ dir_relpath = compute_relpath(*pdh, NULL);
*local_relpath = svn_relpath_join(dir_relpath,
build_relpath,
result_pool);
@@ -555,7 +555,7 @@ svn_wc__db_pdh_parse_local_abspath(svn_w
/* The subdirectory's relpath is easily computed relative to the
wcroot that we just found. */
- dir_relpath = svn_wc__db_pdh_compute_relpath(*pdh, NULL);
+ dir_relpath = compute_relpath(*pdh, NULL);
/* And the result local_relpath may include a filename. */
*local_relpath = svn_relpath_join(dir_relpath, build_relpath, result_pool);
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_private.h?rev=1073831&r1=1073830&r2=1073831&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_private.h Wed Feb 23 17:11:34 2011
@@ -169,11 +169,6 @@ svn_wc__db_wcroot_parse_local_abspath(sv
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* POOL may be NULL if the lifetime of LOCAL_ABSPATH is sufficient. */
-const char *
-svn_wc__db_pdh_compute_relpath(const svn_wc__db_pdh_t *pdh,
- apr_pool_t *result_pool);
-
/* Assert that the given WCROOT is usable.
NOTE: the expression is multiply-evaluated!! */
#define VERIFY_USABLE_WCROOT(wcroot) SVN_ERR_ASSERT( \