You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2012/09/17 18:34:11 UTC
svn commit: r1386703 - in /subversion/branches/inheritable-props/subversion:
include/svn_props.h libsvn_subr/properties.c
Author: pburba
Date: Mon Sep 17 16:34:11 2012
New Revision: 1386703
URL: http://svn.apache.org/viewvc?rev=1386703&view=rev
Log:
On the inheritable-props branch: Remove two unused APIs which were added
during development work on this branch.
* subversion/include/svn_props.h
(svn_prop_inherited_item_dup,
svn_prop_inherited_array_dup): Remove.
* subversion/libsvn_subr/properties.c
(svn_prop_inherited_item_dup,
svn_prop_inherited_array_dup): Remove.
Modified:
subversion/branches/inheritable-props/subversion/include/svn_props.h
subversion/branches/inheritable-props/subversion/libsvn_subr/properties.c
Modified: subversion/branches/inheritable-props/subversion/include/svn_props.h
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/include/svn_props.h?rev=1386703&r1=1386702&r2=1386703&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/include/svn_props.h (original)
+++ subversion/branches/inheritable-props/subversion/include/svn_props.h Mon Sep 17 16:34:11 2012
@@ -103,29 +103,6 @@ typedef struct svn_prop_inherited_item_t
/**
- * Return a deep copy of @a inherited_prop, allocated in @a result_pool.
- * Use @a scratch_pool for temporary allocations.
- * @since New in 1.8.
- */
-svn_prop_inherited_item_t *
-svn_prop_inherited_item_dup(const svn_prop_inherited_item_t *inherited_prop,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/**
- * Return a deep copy the array @a prop_array of svn_prop_inherited_item_t *
- * items in @a result_pool. Use @a scratch_pool for temporary allocations.
- *
- * @since New in 1.8.
- */
-apr_array_header_t *
-svn_prop_inherited_array_dup(const apr_array_header_t *prop_array,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-
-/**
* Given a hash (keys <tt>const char *</tt> and values <tt>const
* svn_string_t</tt>) of properties, returns an array of svn_prop_t
* items using @a pool.
Modified: subversion/branches/inheritable-props/subversion/libsvn_subr/properties.c
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/libsvn_subr/properties.c?rev=1386703&r1=1386702&r2=1386703&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/libsvn_subr/properties.c (original)
+++ subversion/branches/inheritable-props/subversion/libsvn_subr/properties.c Mon Sep 17 16:34:11 2012
@@ -396,51 +396,3 @@ svn_prop_get_value(apr_hash_t *props,
return NULL;
}
-
-svn_prop_inherited_item_t *
-svn_prop_inherited_item_dup(const svn_prop_inherited_item_t *inherited_prop,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- apr_hash_index_t *hi;
- svn_prop_inherited_item_t *new_iprop = apr_palloc(result_pool,
- sizeof(*new_iprop));
-
- new_iprop->path_or_url = apr_pstrdup(
- result_pool, inherited_prop->path_or_url);
- new_iprop->prop_hash = apr_hash_make(result_pool);
-
- for (hi = apr_hash_first(scratch_pool, inherited_prop->prop_hash);
- hi;
- hi = apr_hash_next(hi))
- {
- const char *name = svn__apr_hash_index_key(hi);
- svn_string_t *value = svn__apr_hash_index_val(hi);
- apr_hash_set(new_iprop->prop_hash,
- apr_pstrdup(result_pool, name),
- APR_HASH_KEY_STRING,
- svn_string_dup(value, result_pool));
- }
-
- return new_iprop;
-}
-
-apr_array_header_t *
-svn_prop_inherited_array_dup(const apr_array_header_t *prop_array,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- int i;
- apr_array_header_t *new_array = apr_array_make(
- result_pool, prop_array->nelts, sizeof(svn_prop_inherited_item_t *));
-
- for (i = 0; i < prop_array->nelts; ++i)
- {
- svn_prop_inherited_item_t *elt =
- APR_ARRAY_IDX(prop_array, i, svn_prop_inherited_item_t *);
-
- elt = svn_prop_inherited_item_dup(elt, result_pool, scratch_pool);
- APR_ARRAY_PUSH(new_array, svn_prop_inherited_item_t *) = elt;
- }
- return new_array;
-}