You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/03 09:54:29 UTC
svn commit: r1333340 - in /subversion/trunk/subversion: include/private/
libsvn_client/ libsvn_fs/ libsvn_fs_fs/ libsvn_ra_serf/ libsvn_repos/
libsvn_subr/ libsvn_wc/ svnrdump/
Author: stefan2
Date: Thu May 3 07:54:28 2012
New Revision: 1333340
URL: http://svn.apache.org/viewvc?rev=1333340&view=rev
Log:
Move private API declarations from svn_hash_private.h to
svn_subr_private.h. Also, fix serf build.
* subversion/include/private/svn_hash_pivate.h
drop
* subversion/include/private/svn_subr_pivate.h
(svn_hash__clear, svn_hash__get_cstring, svn_hash__get_bool,
svn_hash__make, svn_hash__make_fast): move here
* subversion/libsvn_client/merge.c,
subversion/libsvn_client/patch.c,
subversion/libsvn_fs/fs-loader.c,
subversion/libsvn_fs_fs/caching.c,
subversion/libsvn_fs_fs/fs_fs.c,
subversion/libsvn_fs_fs/temp_serializer.c,
subversion/libsvn_ra_serf/serf.c,
subversion/libsvn_repos/repos.c,
subversion/libsvn_subr/hash.c,
subversion/libsvn_wc/adm_ops.c,
subversion/svnrdump/dump_editor.c:
include subversion/include/private/svn_subr_pivate.h
Suggested by: gstein
Found by: gstein
Removed:
subversion/trunk/subversion/include/private/svn_hash_private.h
Modified:
subversion/trunk/subversion/include/private/svn_subr_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/patch.c
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs_fs/caching.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_repos/repos.c
subversion/trunk/subversion/libsvn_subr/hash.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/svnrdump/dump_editor.c
Modified: subversion/trunk/subversion/include/private/svn_subr_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_subr_private.h?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_subr_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_subr_private.h Thu May 3 07:54:28 2012
@@ -220,6 +220,90 @@ svn_checksum_t *
svn_checksum__from_digest_sha1(const unsigned char *digest,
apr_pool_t *result_pool);
+
+/**
+ * @defgroup svn_hash_support Hash table serialization support
+ * @{
+ */
+
+/*----------------------------------------------------*/
+
+/**
+ * @defgroup svn_hash_misc Miscellaneous hash APIs
+ * @{
+ */
+
+/**
+ * Clear any key/value pairs in the hash table. A wrapper for a
+ * apr_hash_clear(), which isn't available until APR 1.3.0.
+ *
+ * @since New in 1.5.
+ */
+svn_error_t *
+svn_hash__clear(apr_hash_t *hash, apr_pool_t *pool);
+
+/** @} */
+
+
+/**
+ * @defgroup svn_hash_getters Specialized getter APIs for hashes
+ * @{
+ */
+
+/** Find the value of a @a key in @a hash, return the value.
+ *
+ * If @a hash is @c NULL or if the @a key cannot be found, the
+ * @a default_value will be returned.
+ *
+ * @since New in 1.7.
+ */
+const char *
+svn_hash__get_cstring(apr_hash_t *hash,
+ const char *key,
+ const char *default_value);
+
+/** Like svn_hash_get_cstring(), but for boolean values.
+ *
+ * Parses the value as a boolean value. The recognized representations
+ * are 'TRUE'/'FALSE', 'yes'/'no', 'on'/'off', '1'/'0'; case does not
+ * matter.
+ *
+ * @since New in 1.7.
+ */
+svn_boolean_t
+svn_hash__get_bool(apr_hash_t *hash,
+ const char *key,
+ svn_boolean_t default_value);
+
+/** @} */
+
+/**
+ * @defgroup svn_hash_create Create optimized APR hash tables
+ * @{
+ */
+
+/** Returns a hash table, allocated in @a pool, with the same ordering of
+ * elements as APR 1.4.5 or earlier (using apr_hashfunc_default) but uses
+ * a faster hash function implementation.
+ *
+ * @since New in 1.8.
+ */
+apr_hash_t *
+svn_hash__make(apr_pool_t *pool);
+
+/** Returns a hash table, allocated in @a pool, that is faster to modify
+ * and access then the ones returned by @ref svn_hash__make. The element
+ * order does not match any APR default.
+ *
+ * @since New in 1.8.
+ */
+apr_hash_t *
+svn_hash__make_fast(apr_pool_t *pool);
+
+/** @} */
+
+/** @} */
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu May 3 07:54:28 2012
@@ -59,7 +59,7 @@
#include "private/svn_fspath.h"
#include "private/svn_ra_private.h"
#include "private/svn_client_private.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Thu May 3 07:54:28 2012
@@ -47,7 +47,7 @@
#include "private/svn_wc_private.h"
#include "private/svn_dep_compat.h"
#include "private/svn_string_private.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
typedef struct hunk_info_t {
/* The hunk. */
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Thu May 3 07:54:28 2012
@@ -44,7 +44,7 @@
#include "private/svn_fs_util.h"
#include "private/svn_utf_private.h"
#include "private/svn_mutex.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "fs-loader.h"
#include "svn_hash.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/caching.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/caching.c Thu May 3 07:54:28 2012
@@ -33,7 +33,7 @@
#include "svn_private_config.h"
#include "svn_hash.h"
#include "private/svn_debug.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
/* Return a memcache in *MEMCACHE_P for FS if it's configured to use
memcached, or NULL otherwise. Also, sets *FAIL_STOP to a boolean
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu May 3 07:54:28 2012
@@ -61,7 +61,7 @@
#include "private/svn_string_private.h"
#include "private/svn_fs_util.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "../libsvn_fs/fs-loader.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Thu May 3 07:54:28 2012
@@ -30,7 +30,7 @@
#include "private/svn_fs_util.h"
#include "private/svn_temp_serializer.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "temp_serializer.h"
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Thu May 3 07:54:28 2012
@@ -48,6 +48,7 @@
#include "private/svn_dav_protocol.h"
#include "private/svn_dep_compat.h"
#include "private/svn_fspath.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
#include "ra_serf.h"
Modified: subversion/trunk/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/repos.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/repos.c (original)
+++ subversion/trunk/subversion/libsvn_repos/repos.c Thu May 3 07:54:28 2012
@@ -36,7 +36,7 @@
#include "svn_version.h"
#include "private/svn_repos_private.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h" /* for SVN_TEMPLATE_ROOT_DIR */
#include "repos.h"
Modified: subversion/trunk/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/hash.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/hash.c (original)
+++ subversion/trunk/subversion/libsvn_subr/hash.c Thu May 3 07:54:28 2012
@@ -40,7 +40,7 @@
#include "svn_pools.h"
#include "private/svn_dep_compat.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu May 3 07:54:28 2012
@@ -59,7 +59,7 @@
#include "svn_private_config.h"
#include "private/svn_io_private.h"
#include "private/svn_wc_private.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
struct svn_wc_committed_queue_t
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1333340&r1=1333339&r2=1333340&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Thu May 3 07:54:28 2012
@@ -31,7 +31,7 @@
#include "svn_dirent_uri.h"
#include "private/svn_fspath.h"
-#include "private/svn_hash_private.h"
+#include "private/svn_subr_private.h"
#include "svnrdump.h"