Author: julianfoad
Date: Thu Jul 7 15:24:14 2011
New Revision: 1143881
URL: http://svn.apache.org/viewvc?rev=1143881&view=rev
Log:
Fix a doc string and move some related deprecated functions.
* subversion/include/svn_client.h
(svn_proplist_receiver_t): Correct and improve the doc string.
* subversion/libsvn_client/deprecated.c
(string_hash_dup, svn_client_proplist_item_dup): Move these deprecated
functions from here ...
* subversion/libsvn_client/util.c
(string_hash_dup, svn_client_proplist_item_dup): ... to here.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/util.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1143881&r1=1143880&r2=1143881&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jul 7 15:24:14 2011
@@ -356,8 +356,9 @@ typedef struct svn_client_proplist_item_
/**
* The callback invoked by svn_client_proplist3(). Each invocation
- * describes the property specified by @a item. Use @a pool for all
- * temporary allocation.
+ * provides the regular properties of @a path which is either a WC path or
+ * a URL. @a prop_hash maps property names (char *) to property
+ values (svn_string_t *). Use @a pool for all temporary allocation.
*
* @since New in 1.5.
*/
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1143881&r1=1143880&r2=1143881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Thu Jul 7 15:24:14
2011
@@ -38,6 +38,7 @@
#include "svn_compat.h"
#include "svn_props.h"
#include "svn_utf.h"
+#include "svn_string.h"
#include "client.h"
#include "mergeinfo.h"
@@ -1721,6 +1722,40 @@ svn_client_propget(apr_hash_t **props,
}
+/* Duplicate a HASH containing (char * -> svn_string_t *) key/value
+ pairs using POOL. */
+static apr_hash_t *
+string_hash_dup(apr_hash_t *hash, apr_pool_t *pool)
+{
+ apr_hash_index_t *hi;
+ apr_hash_t *new_hash = apr_hash_make(pool);
+
+ for (hi = apr_hash_first(pool, hash); hi; hi = apr_hash_next(hi))
+ {
+ const char *key = apr_pstrdup(pool, svn__apr_hash_index_key(hi));
+ apr_ssize_t klen = svn__apr_hash_index_klen(hi);
+ svn_string_t *val = svn_string_dup(svn__apr_hash_index_val(hi), pool);
+
+ apr_hash_set(new_hash, key, klen, val);
+ }
+ return new_hash;
+}
+
+svn_client_proplist_item_t *
+svn_client_proplist_item_dup(const svn_client_proplist_item_t *item,
+ apr_pool_t * pool)
+{
+ svn_client_proplist_item_t *new_item = apr_pcalloc(pool, sizeof(*new_item));
+
+ if (item->node_name)
+ new_item->node_name = svn_stringbuf_dup(item->node_name, pool);
+
+ if (item->prop_hash)
+ new_item->prop_hash = string_hash_dup(item->prop_hash, pool);
+
+ return new_item;
+}
+
/* Receiver baton used by proplist2() */
struct proplist_receiver_baton {
apr_array_header_t *props;
Modified: subversion/trunk/subversion/libsvn_client/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1143881&r1=1143880&r2=1143881&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Thu Jul 7 15:24:14 2011
@@ -25,7 +25,6 @@
#include <apr_strings.h>
#include "svn_pools.h"
-#include "svn_string.h"
#include "svn_error.h"
#include "svn_types.h"
#include "svn_opt.h"
@@ -42,25 +41,6 @@
#include "svn_private_config.h"
-/* Duplicate a HASH containing (char * -> svn_string_t *) key/value
- pairs using POOL. */
-static apr_hash_t *
-string_hash_dup(apr_hash_t *hash, apr_pool_t *pool)
-{
- apr_hash_index_t *hi;
- apr_hash_t *new_hash = apr_hash_make(pool);
-
- for (hi = apr_hash_first(pool, hash); hi; hi = apr_hash_next(hi))
- {
- const char *key = apr_pstrdup(pool, svn__apr_hash_index_key(hi));
- apr_ssize_t klen = svn__apr_hash_index_klen(hi);
- svn_string_t *val = svn_string_dup(svn__apr_hash_index_val(hi), pool);
-
- apr_hash_set(new_hash, key, klen, val);
- }
- return new_hash;
-}
-
svn_client_commit_item3_t *
svn_client_commit_item3_create(apr_pool_t *pool)
{
@@ -95,21 +75,6 @@ svn_client_commit_item3_dup(const svn_cl
return new_item;
}
-svn_client_proplist_item_t *
-svn_client_proplist_item_dup(const svn_client_proplist_item_t *item,
- apr_pool_t * pool)
-{
- svn_client_proplist_item_t *new_item = apr_pcalloc(pool, sizeof(*new_item));
-
- if (item->node_name)
- new_item->node_name = svn_stringbuf_dup(item->node_name, pool);
-
- if (item->prop_hash)
- new_item->prop_hash = string_hash_dup(item->prop_hash, pool);
-
- return new_item;
-}
-
svn_error_t *
svn_client__path_relative_to_root(const char **rel_path,
svn_wc_context_t *wc_ctx,
