Author: rhuijben
Date: Fri Jul 2 09:33:40 2010
New Revision: 959928
URL: http://svn.apache.org/viewvc?rev=959928&view=rev
Log:
Remove two now-unused entry helper functions.
* subversion/libsvn_wc/entries.c
(svn_wc__get_entry_versioned): Remove function.
(svn_wc__node_is_deleted): Remove function.
* subversion/libsvn_wc/entries.h
(svn_wc__get_entry_versioned): Remove function.
(svn_wc__node_is_deleted): Remove function.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/entries.h
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=959928&r1=959927&r2=959928&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Fri Jul 2 09:33:40 2010
@@ -1509,84 +1509,6 @@ svn_wc__get_entry(const svn_wc_entry_t *
return SVN_NO_ERROR;
}
-
-svn_error_t *
-svn_wc__get_entry_versioned(const svn_wc_entry_t **entry,
- svn_wc__db_t *db,
- const char *local_abspath,
- svn_node_kind_t kind,
- svn_boolean_t show_hidden,
- svn_boolean_t need_parent_stub,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_error_t *err;
-
- SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
-
- /* We call this with allow_unversioned=TRUE, since the error returned is
- different than our callers currently expect. We catch the NULL entry
- below and return the correct error. */
- err = svn_wc__get_entry(entry, db, local_abspath, TRUE, kind,
- need_parent_stub, result_pool, scratch_pool);
- if (err && (err->apr_err == SVN_ERR_WC_MISSING
- || err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND
- || err->apr_err == SVN_ERR_NODE_UNEXPECTED_KIND))
- {
- svn_error_clear(err);
- *entry = NULL;
- }
- else if (err)
- return svn_error_return(err);
-
-
- if (*entry && !show_hidden)
- {
- svn_boolean_t hidden;
-
- SVN_ERR(svn_wc__entry_is_hidden(&hidden, *entry));
- if (hidden)
- *entry = NULL;
- }
-
- if (! *entry)
- return svn_error_createf(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- _("'%s' is not under version control"),
- svn_dirent_local_style(local_abspath,
- scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-
-svn_error_t *
-svn_wc__node_is_deleted(svn_boolean_t *deleted,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- const svn_wc_entry_t *entry;
- svn_error_t *err;
-
- /* ### rewrite this in terms of wc_db. */
-
- err = svn_wc__get_entry(&entry, db, local_abspath, FALSE,
- svn_node_unknown, TRUE, scratch_pool, scratch_pool);
- if (err)
- {
- if (err->apr_err != SVN_ERR_NODE_UNEXPECTED_KIND)
- return svn_error_return(err);
-
- /* We asked for the parent stub, but got a file. No big deal. We have
- what we wanted for a file. */
- svn_error_clear(err);
- }
-
- *deleted = entry->deleted;
- return SVN_NO_ERROR;
-}
-
-
/* TODO ### Rewrite doc string to mention ENTRIES_ALL; not ADM_ACCESS.
Prune the deleted entries from the cached entries in ADM_ACCESS, and
Modified: subversion/trunk/subversion/libsvn_wc/entries.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.h?rev=959928&r1=959927&r2=959928&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.h (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.h Fri Jul 2 09:33:40 2010
@@ -85,25 +85,6 @@ svn_wc__get_entry(const svn_wc_entry_t *
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-
-/** Similar to svn_wc__get_entry() and svn_wc__entry_versioned().
- *
- * This function allows callers in libsvn_client to directly fetch entry data
- * without having to open up an adm_access baton. Its error and return
- * semantics are the same as svn_wc__entry_versioned(), and parameters are the
- * same as svn_wc__get_entry() (defined in libsvn_wc/entries.h).
- */
-svn_error_t *
-svn_wc__get_entry_versioned(const svn_wc_entry_t **entry,
- svn_wc__db_t *db,
- const char *local_abspath,
- svn_node_kind_t kind,
- svn_boolean_t show_hidden,
- svn_boolean_t need_parent_stub,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
/* Is ENTRY in a 'hidden' state in the sense of the 'show_hidden'
* switches on svn_wc_entries_read(), svn_wc_walk_entries*(), etc.? */
svn_error_t *
@@ -127,15 +108,6 @@ svn_wc__write_upgraded_entries(svn_wc__d
apr_hash_t *entries,
apr_pool_t *scratch_pool);
-
-/* ### return a flag corresponding to the classic "DELETED" concept. */
-svn_error_t *
-svn_wc__node_is_deleted(svn_boolean_t *deleted,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
-
/* Parse a file external specification in the NULL terminated STR and
place the path in PATH_RESULT, the peg revision in PEG_REV_RESULT
and revision number in REV_RESULT. STR may be NULL, in which case
