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 2013/03/30 21:02:33 UTC
svn commit: r1462850 [7/14] - in /subversion/branches/fsfs-format7: ./
build/ build/ac-macros/ build/generator/ contrib/client-side/svncopy/
notes/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversi...
Modified: subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c Sat Mar 30 20:02:27 2013
@@ -32,6 +32,7 @@
#include <apr_network_io.h>
#include <apr_uri.h>
+#include "svn_hash.h"
#include "svn_types.h"
#include "svn_string.h"
#include "svn_dirent_uri.h"
@@ -388,8 +389,7 @@ static svn_error_t *find_tunnel_agent(co
int n;
/* Look up the tunnel specification in config. */
- cfg = config ? apr_hash_get(config, SVN_CONFIG_CATEGORY_CONFIG,
- APR_HASH_KEY_STRING) : NULL;
+ cfg = config ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG) : NULL;
svn_config_get(cfg, &val, SVN_CONFIG_SECTION_TUNNELS, tunnel, NULL);
/* We have one predefined tunnel scheme, if it isn't overridden by config. */
@@ -750,12 +750,10 @@ static svn_error_t *ra_svn_open(svn_ra_s
else
tunnel_argv = NULL;
- cfg_client = config ? apr_hash_get(config,
- SVN_CONFIG_CATEGORY_CONFIG,
- APR_HASH_KEY_STRING) : NULL;
- cfg = config ? apr_hash_get(config,
- SVN_CONFIG_CATEGORY_SERVERS,
- APR_HASH_KEY_STRING) : NULL;
+ cfg_client = config
+ ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG)
+ : NULL;
+ cfg = config ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_SERVERS) : NULL;
svn_auth_set_parameter(callbacks->auth_baton,
SVN_AUTH_PARAM_CONFIG_CATEGORY_CONFIG, cfg_client);
svn_auth_set_parameter(callbacks->auth_baton,
@@ -990,9 +988,8 @@ static svn_error_t *ra_svn_commit(svn_ra
ra_svn_commit_callback_baton_t *ccb;
apr_hash_index_t *hi;
apr_pool_t *iterpool;
- const svn_string_t *log_msg = apr_hash_get(revprop_table,
- SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING);
+ const svn_string_t *log_msg = svn_hash_gets(revprop_table,
+ SVN_PROP_REVISION_LOG);
/* If we're sending revprops other than svn:log, make sure the server won't
silently ignore them. */
@@ -1007,14 +1004,10 @@ static svn_error_t *ra_svn_commit(svn_ra
if (svn_ra_svn_has_capability(conn, SVN_RA_SVN_CAP_COMMIT_REVPROPS) &&
svn_ra_svn_has_capability(conn, SVN_RA_SVN_CAP_EPHEMERAL_TXNPROPS))
{
- apr_hash_set(revprop_table,
- SVN_PROP_TXN_CLIENT_COMPAT_VERSION,
- APR_HASH_KEY_STRING,
- svn_string_create(SVN_VER_NUMBER, pool));
- apr_hash_set(revprop_table,
- SVN_PROP_TXN_USER_AGENT,
- APR_HASH_KEY_STRING,
- svn_string_create(sess_baton->useragent, pool));
+ svn_hash_sets(revprop_table, SVN_PROP_TXN_CLIENT_COMPAT_VERSION,
+ svn_string_create(SVN_VER_NUMBER, pool));
+ svn_hash_sets(revprop_table, SVN_PROP_TXN_USER_AGENT,
+ svn_string_create(sess_baton->useragent, pool));
}
/* Tell the server we're starting the commit.
@@ -1123,10 +1116,9 @@ parse_iproplist(apr_array_header_t **inh
{
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));
+ svn_hash_sets(new_iprop->prop_hash,
+ apr_pstrdup(result_pool, name),
+ svn_string_dup(value, result_pool));
}
APR_ARRAY_PUSH(*inherited_props, svn_prop_inherited_item_t *) =
new_iprop;
@@ -1292,7 +1284,7 @@ static svn_error_t *ra_svn_get_dir(svn_r
else
SVN_ERR(svn_time_from_cstring(&dirent->time, cdate, pool));
dirent->last_author = cauthor;
- apr_hash_set(*dirents, name, APR_HASH_KEY_STRING, dirent);
+ svn_hash_sets(*dirents, name, dirent);
}
return SVN_NO_ERROR;
@@ -1360,8 +1352,7 @@ static svn_error_t *ra_svn_get_mergeinfo
SVN_ERR(svn_mergeinfo_parse(&for_path, to_parse, pool));
/* Correct for naughty servers that send "relative" paths
with leading slashes! */
- apr_hash_set(*catalog, path[0] == '/' ? path + 1 : path,
- APR_HASH_KEY_STRING, for_path);
+ svn_hash_sets(*catalog, path[0] == '/' ? path + 1 :path, for_path);
}
}
@@ -1624,7 +1615,7 @@ static svn_error_t *ra_svn_log(svn_ra_se
change->node_kind = svn_node_kind_from_word(kind_str);
change->text_modified = optbool_to_tristate(text_mods);
change->props_modified = optbool_to_tristate(prop_mods);
- apr_hash_set(cphash, cpath, APR_HASH_KEY_STRING, change);
+ svn_hash_sets(cphash, cpath, change);
}
}
else
@@ -1641,22 +1632,22 @@ static svn_error_t *ra_svn_log(svn_ra_se
log_entry->has_children = has_children;
log_entry->subtractive_merge = subtractive_merge;
if (rplist)
- SVN_ERR(svn_ra_svn_parse_proplist(rplist, pool,
+ SVN_ERR(svn_ra_svn_parse_proplist(rplist, iterpool,
&log_entry->revprops));
if (log_entry->revprops == NULL)
- log_entry->revprops = apr_hash_make(pool);
+ log_entry->revprops = apr_hash_make(iterpool);
if (revprops == NULL)
{
/* Caller requested all revprops; set author/date/log. */
if (author)
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING, author);
+ svn_hash_sets(log_entry->revprops, SVN_PROP_REVISION_AUTHOR,
+ author);
if (date)
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING, date);
+ svn_hash_sets(log_entry->revprops, SVN_PROP_REVISION_DATE,
+ date);
if (message)
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING, message);
+ svn_hash_sets(log_entry->revprops, SVN_PROP_REVISION_LOG,
+ message);
}
else
{
@@ -1665,14 +1656,14 @@ static svn_error_t *ra_svn_log(svn_ra_se
{
name = APR_ARRAY_IDX(revprops, i, char *);
if (author && strcmp(name, SVN_PROP_REVISION_AUTHOR) == 0)
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING, author);
+ svn_hash_sets(log_entry->revprops,
+ SVN_PROP_REVISION_AUTHOR, author);
if (date && strcmp(name, SVN_PROP_REVISION_DATE) == 0)
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING, date);
+ svn_hash_sets(log_entry->revprops,
+ SVN_PROP_REVISION_DATE, date);
if (message && strcmp(name, SVN_PROP_REVISION_LOG) == 0)
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING, message);
+ svn_hash_sets(log_entry->revprops,
+ SVN_PROP_REVISION_LOG, message);
}
}
SVN_ERR(receiver(receiver_baton, log_entry, iterpool));
@@ -2487,13 +2478,13 @@ static svn_error_t *ra_svn_get_locks(svn
*/
if ((strcmp(abs_path, lock->path) == 0) || (depth == svn_depth_infinity))
{
- apr_hash_set(*locks, lock->path, APR_HASH_KEY_STRING, lock);
+ svn_hash_sets(*locks, lock->path, lock);
}
else if ((depth == svn_depth_files) || (depth == svn_depth_immediates))
{
const char *relpath = svn_fspath__skip_ancestor(abs_path, lock->path);
if (relpath && (svn_path_component_count(relpath) == 1))
- apr_hash_set(*locks, lock->path, APR_HASH_KEY_STRING, lock);
+ svn_hash_sets(*locks, lock->path, lock);
}
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/editorp.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/editorp.c Sat Mar 30 20:02:27 2013
@@ -28,6 +28,7 @@
#include <apr_general.h>
#include <apr_strings.h>
+#include "svn_hash.h"
#include "svn_types.h"
#include "svn_string.h"
#include "svn_error.h"
@@ -499,7 +500,7 @@ static ra_svn_token_entry_t *store_token
entry->is_file = is_file;
entry->dstream = NULL;
entry->pool = pool;
- apr_hash_set(ds->tokens, entry->token, APR_HASH_KEY_STRING, entry);
+ svn_hash_sets(ds->tokens, entry->token, entry);
return entry;
}
@@ -507,7 +508,7 @@ static svn_error_t *lookup_token(ra_svn_
svn_boolean_t is_file,
ra_svn_token_entry_t **entry)
{
- *entry = apr_hash_get(ds->tokens, token, APR_HASH_KEY_STRING);
+ *entry = svn_hash_gets(ds->tokens, token);
if (!*entry || (*entry)->is_file != is_file)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Invalid file or dir token during edit"));
@@ -646,7 +647,7 @@ static svn_error_t *ra_svn_handle_close_
/* Close the directory and destroy the baton. */
SVN_CMD_ERR(ds->editor->close_directory(entry->baton, pool));
- apr_hash_set(ds->tokens, token, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(ds->tokens, token, NULL);
svn_pool_destroy(entry->pool);
return SVN_NO_ERROR;
}
@@ -816,7 +817,7 @@ static svn_error_t *ra_svn_handle_close_
/* Close the file and destroy the baton. */
SVN_CMD_ERR(ds->editor->close_file(entry->baton, text_checksum, pool));
- apr_hash_set(ds->tokens, token, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(ds->tokens, token, NULL);
if (--ds->file_refs == 0)
svn_pool_clear(ds->file_pool);
return SVN_NO_ERROR;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c Sat Mar 30 20:02:27 2013
@@ -32,6 +32,7 @@
#include <apr_lib.h>
#include <apr_strings.h>
+#include "svn_hash.h"
#include "svn_types.h"
#include "svn_string.h"
#include "svn_error.h"
@@ -155,7 +156,7 @@ svn_error_t *svn_ra_svn_set_capabilities
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Capability entry is not a word"));
word = apr_pstrdup(conn->pool, item->u.word);
- apr_hash_set(conn->capabilities, word, APR_HASH_KEY_STRING, word);
+ svn_hash_sets(conn->capabilities, word, word);
}
return SVN_NO_ERROR;
}
@@ -171,8 +172,7 @@ svn_ra_svn__set_shim_callbacks(svn_ra_sv
svn_boolean_t svn_ra_svn_has_capability(svn_ra_svn_conn_t *conn,
const char *capability)
{
- return (apr_hash_get(conn->capabilities, capability,
- APR_HASH_KEY_STRING) != NULL);
+ return (svn_hash_gets(conn->capabilities, capability) != NULL);
}
int
@@ -1659,7 +1659,7 @@ svn_error_t *svn_ra_svn_parse_proplist(c
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Proplist element not a list"));
SVN_ERR(svn_ra_svn_parse_tuple(elt->u.list, pool, "cs", &name, &value));
- apr_hash_set(*props, name, APR_HASH_KEY_STRING, value);
+ svn_hash_sets(*props, name, value);
}
return SVN_NO_ERROR;
@@ -1777,7 +1777,7 @@ svn_error_t *svn_ra_svn_handle_commands2
apr_hash_t *cmd_hash = apr_hash_make(subpool);
for (command = commands; command->cmdname; command++)
- apr_hash_set(cmd_hash, command->cmdname, APR_HASH_KEY_STRING, command);
+ svn_hash_sets(cmd_hash, command->cmdname, command);
while (1)
{
@@ -1794,7 +1794,7 @@ svn_error_t *svn_ra_svn_handle_commands2
}
return err;
}
- command = apr_hash_get(cmd_hash, cmdname, APR_HASH_KEY_STRING);
+ command = svn_hash_gets(cmd_hash, cmdname);
if (command)
err = (*command->handler)(conn, iterpool, params, baton);
Modified: subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/ra_svn.h?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/ra_svn.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/ra_svn.h Sat Mar 30 20:02:27 2013
@@ -36,6 +36,8 @@ extern "C" {
#include "svn_ra.h"
#include "svn_ra_svn.h"
+#include "private/svn_ra_svn_private.h"
+
/* Callback function that indicates if a svn_ra_svn__stream_t has pending
* data.
*/
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/authz.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/authz.c Sat Mar 30 20:02:27 2013
@@ -26,6 +26,7 @@
#include <apr_pools.h>
#include <apr_file_io.h>
+#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_error.h"
#include "svn_dirent_uri.h"
@@ -512,8 +513,7 @@ authz_group_walk(svn_config_t *cfg,
{
/* A circular dependency between groups is a Bad Thing. We
don't do authz with invalid ACL files. */
- if (apr_hash_get(checked_groups, &group_user[1],
- APR_HASH_KEY_STRING))
+ if (svn_hash_gets(checked_groups, &group_user[1]))
return svn_error_createf(SVN_ERR_AUTHZ_INVALID_CONFIG,
NULL,
"Circular dependency between "
@@ -521,8 +521,7 @@ authz_group_walk(svn_config_t *cfg,
&group_user[1], group);
/* Add group to hash of checked groups. */
- apr_hash_set(checked_groups, &group_user[1],
- APR_HASH_KEY_STRING, "");
+ svn_hash_sets(checked_groups, &group_user[1], "");
/* Recurse on that group. */
SVN_ERR(authz_group_walk(cfg, &group_user[1],
@@ -531,8 +530,7 @@ authz_group_walk(svn_config_t *cfg,
/* Remove group from hash of checked groups, so that we don't
incorrectly report an error if we see it again as part of
another group. */
- apr_hash_set(checked_groups, &group_user[1],
- APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(checked_groups, &group_user[1], NULL);
}
else if (*group_user == '&')
{
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/commit.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/commit.c Sat Mar 30 20:02:27 2013
@@ -26,6 +26,7 @@
#include <apr_pools.h>
#include <apr_file_io.h>
+#include "svn_hash.h"
#include "svn_compat.h"
#include "svn_pools.h"
#include "svn_error.h"
@@ -35,6 +36,7 @@
#include "svn_fs.h"
#include "svn_repos.h"
#include "svn_checksum.h"
+#include "svn_ctype.h"
#include "svn_props.h"
#include "svn_mergeinfo.h"
#include "svn_private_config.h"
@@ -257,6 +259,78 @@ make_dir_baton(struct edit_baton *edit_b
return db;
}
+/* Return a copy of PATH, allocated from POOL, for which control
+ characters have been escaped using the form \NNN (where NNN is the
+ octal representation of the byte's ordinal value). */
+static const char *
+illegal_path_escape(const char *path, apr_pool_t *pool)
+{
+ svn_stringbuf_t *retstr;
+ apr_size_t i, copied = 0;
+ int c;
+
+ /* At least one control character:
+ strlen - 1 (control) + \ + N + N + N + null . */
+ retstr = svn_stringbuf_create_ensure(strlen(path) + 4, pool);
+ for (i = 0; path[i]; i++)
+ {
+ c = (unsigned char)path[i];
+ if (! svn_ctype_iscntrl(c))
+ continue;
+
+ /* If we got here, we're looking at a character that isn't
+ supported by the (or at least, our) URI encoding scheme. We
+ need to escape this character. */
+
+ /* First things first, copy all the good stuff that we haven't
+ yet copied into our output buffer. */
+ if (i - copied)
+ svn_stringbuf_appendbytes(retstr, path + copied,
+ i - copied);
+
+ /* Make sure buffer is big enough for '\' 'N' 'N' 'N' (and NUL) */
+ svn_stringbuf_ensure(retstr, retstr->len + 4);
+ /*### The backslash separator doesn't work too great with Windows,
+ but it's what we'll use for consistency with invalid utf8
+ formatting (until someone has a better idea) */
+ apr_snprintf(retstr->data + retstr->len, 5, "\\%03o", (unsigned char)c);
+ retstr->len += 4;
+
+ /* Finally, update our copy counter. */
+ copied = i + 1;
+ }
+
+ /* If we didn't encode anything, we don't need to duplicate the string. */
+ if (retstr->len == 0)
+ return path;
+
+ /* Anything left to copy? */
+ if (i - copied)
+ svn_stringbuf_appendbytes(retstr, path + copied, i - copied);
+
+ /* retstr is null-terminated either by apr_snprintf or the svn_stringbuf
+ functions. */
+
+ return retstr->data;
+}
+
+/* Reject paths which contain control characters (related to issue #4340). */
+static svn_error_t *
+check_valid_path(const char *path,
+ apr_pool_t *pool)
+{
+ const char *c;
+
+ for (c = path; *c; c++)
+ {
+ if (svn_ctype_iscntrl(*c))
+ return svn_error_createf(SVN_ERR_FS_PATH_SYNTAX, NULL,
+ _("Invalid control character '0x%02x' in path '%s'"),
+ (unsigned char)*c, illegal_path_escape(path, pool));
+ }
+
+ return SVN_NO_ERROR;
+}
/* This function is the shared guts of add_file() and add_directory(),
which see for the meanings of the parameters. The only extra
@@ -277,6 +351,8 @@ add_file_or_directory(const char *path,
svn_boolean_t was_copied = FALSE;
const char *full_path;
+ SVN_ERR(check_valid_path(path, pool));
+
full_path = svn_fspath__join(eb->base_path,
svn_relpath_canonicalize(path, pool), pool);
@@ -850,14 +926,13 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
struct edit_baton *eb = baton;
- svn_node_kind_t node_kind;
svn_fs_root_t *fs_root;
if (!SVN_IS_VALID_REVNUM(base_revision))
@@ -865,8 +940,7 @@ fetch_kind_func(svn_kind_t *kind,
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs, base_revision, scratch_pool));
- SVN_ERR(svn_fs_check_path(&node_kind, fs_root, path, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
+ SVN_ERR(svn_fs_check_path(kind, fs_root, path, scratch_pool));
return SVN_NO_ERROR;
}
@@ -1085,7 +1159,7 @@ add_symlink_cb(void *baton,
static svn_error_t *
add_absent_cb(void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
@@ -1335,8 +1409,7 @@ svn_repos__get_commit_ev2(svn_editor_t *
/* Can the user modify the repository at all? */
/* ### check against AUTHZ. */
- author = apr_hash_get(revprops, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING);
+ author = svn_hash_gets(revprops, SVN_PROP_REVISION_AUTHOR);
eb = apr_palloc(result_pool, sizeof(*eb));
eb->repos = repos;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/delta.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/delta.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/delta.c Sat Mar 30 20:02:27 2013
@@ -24,6 +24,7 @@
#include <apr_hash.h>
+#include "svn_hash.h"
#include "svn_types.h"
#include "svn_delta.h"
#include "svn_fs.h"
@@ -506,8 +507,7 @@ delta_proplists(struct context *c,
pool));
/* Transmit the committed-date. */
- committed_date = apr_hash_get(r_props, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING);
+ committed_date = svn_hash_gets(r_props, SVN_PROP_REVISION_DATE);
if (committed_date || source_path)
{
SVN_ERR(change_fn(c, object, SVN_PROP_ENTRY_COMMITTED_DATE,
@@ -515,8 +515,7 @@ delta_proplists(struct context *c,
}
/* Transmit the last-author. */
- last_author = apr_hash_get(r_props, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING);
+ last_author = svn_hash_gets(r_props, SVN_PROP_REVISION_AUTHOR);
if (last_author || source_path)
{
SVN_ERR(change_fn(c, object, SVN_PROP_ENTRY_LAST_AUTHOR,
@@ -1020,7 +1019,7 @@ delta_dirs(struct context *c,
}
/* Remove the entry from the source_hash. */
- apr_hash_set(s_entries, key, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(s_entries, key, NULL);
}
else
{
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/deprecated.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/deprecated.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/deprecated.c Sat Mar 30 20:02:27 2013
@@ -28,6 +28,7 @@
#include "svn_repos.h"
#include "svn_compat.h"
+#include "svn_hash.h"
#include "svn_props.h"
#include "svn_private_config.h"
@@ -56,13 +57,11 @@ svn_repos_get_commit_editor4(const svn_d
{
apr_hash_t *revprop_table = apr_hash_make(pool);
if (user)
- apr_hash_set(revprop_table, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING,
- svn_string_create(user, pool));
+ svn_hash_sets(revprop_table, SVN_PROP_REVISION_AUTHOR,
+ svn_string_create(user, pool));
if (log_msg)
- apr_hash_set(revprop_table, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING,
- svn_string_create(log_msg, pool));
+ svn_hash_sets(revprop_table, SVN_PROP_REVISION_LOG,
+ svn_string_create(log_msg, pool));
return svn_repos_get_commit_editor5(editor, edit_baton, repos, txn,
repos_url, base_path, revprop_table,
commit_callback, commit_baton,
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c Sat Mar 30 20:02:27 2013
@@ -471,9 +471,8 @@ dump_node(struct edit_baton *eb,
dumped. */
if (!eb->verify && eb->notify_func && eb->oldest_dumped_rev > 1)
{
- svn_string_t *mergeinfo_str = apr_hash_get(prophash,
- SVN_PROP_MERGEINFO,
- APR_HASH_KEY_STRING);
+ svn_string_t *mergeinfo_str = svn_hash_gets(prophash,
+ SVN_PROP_MERGEINFO);
if (mergeinfo_str)
{
svn_mergeinfo_t mergeinfo, old_mergeinfo;
@@ -655,7 +654,7 @@ delete_entry(const char *path,
const char *mypath = apr_pstrdup(pb->pool, path);
/* remember this path needs to be deleted. */
- apr_hash_set(pb->deleted_entries, mypath, APR_HASH_KEY_STRING, pb);
+ svn_hash_sets(pb->deleted_entries, mypath, pb);
return SVN_NO_ERROR;
}
@@ -677,7 +676,7 @@ add_directory(const char *path,
= make_dir_baton(path, copyfrom_path, copyfrom_rev, eb, pb, TRUE, pool);
/* This might be a replacement -- is the path already deleted? */
- val = apr_hash_get(pb->deleted_entries, path, APR_HASH_KEY_STRING);
+ val = svn_hash_gets(pb->deleted_entries, path);
/* Detect an add-with-history. */
is_copy = ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev);
@@ -693,7 +692,7 @@ add_directory(const char *path,
if (val)
/* Delete the path, it's now been dumped. */
- apr_hash_set(pb->deleted_entries, path, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(pb->deleted_entries, path, NULL);
new_db->written_out = TRUE;
@@ -780,7 +779,7 @@ add_file(const char *path,
svn_boolean_t is_copy = FALSE;
/* This might be a replacement -- is the path already deleted? */
- val = apr_hash_get(pb->deleted_entries, path, APR_HASH_KEY_STRING);
+ val = svn_hash_gets(pb->deleted_entries, path);
/* Detect add-with-history. */
is_copy = ARE_VALID_COPY_ARGS(copyfrom_path, copyfrom_rev);
@@ -796,7 +795,7 @@ add_file(const char *path,
if (val)
/* delete the path, it's now been dumped. */
- apr_hash_set(pb->deleted_entries, path, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(pb->deleted_entries, path, NULL);
*file_baton = NULL; /* muhahahaha */
return SVN_NO_ERROR;
@@ -886,14 +885,13 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
struct edit_baton *eb = baton;
- svn_node_kind_t node_kind;
svn_fs_root_t *fs_root;
if (!SVN_IS_VALID_REVNUM(base_revision))
@@ -901,8 +899,7 @@ fetch_kind_func(svn_kind_t *kind,
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs, base_revision, scratch_pool));
- SVN_ERR(svn_fs_check_path(&node_kind, fs_root, path, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
+ SVN_ERR(svn_fs_check_path(kind, fs_root, path, scratch_pool));
return SVN_NO_ERROR;
}
@@ -1044,15 +1041,13 @@ write_revision_record(svn_stream_t *stre
/* Run revision date properties through the time conversion to
canonicalize them. */
/* ### Remove this when it is no longer needed for sure. */
- datevalue = apr_hash_get(props, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING);
+ datevalue = svn_hash_gets(props, SVN_PROP_REVISION_DATE);
if (datevalue)
{
SVN_ERR(svn_time_from_cstring(&timetemp, datevalue->data, pool));
datevalue = svn_string_create(svn_time_to_cstring(timetemp, pool),
pool);
- apr_hash_set(props, SVN_PROP_REVISION_DATE, APR_HASH_KEY_STRING,
- datevalue);
+ svn_hash_sets(props, SVN_PROP_REVISION_DATE, datevalue);
}
encoded_prophash = svn_stringbuf_create_ensure(0, pool);
@@ -1439,7 +1434,7 @@ svn_repos_verify_fs2(svn_repos_t *repos,
verify_notify_baton->notify_func = notify_func;
verify_notify_baton->notify_baton = notify_baton;
verify_notify_baton->notify
- = svn_repos_notify_create(svn_repos_notify_verify_struc_rev, pool);
+ = svn_repos_notify_create(svn_repos_notify_verify_rev_structure, pool);
}
/* Verify global metadata and backend-specific data first. */
@@ -1474,9 +1469,9 @@ svn_repos_verify_fs2(svn_repos_t *repos,
&cancel_edit_baton,
iterpool));
- SVN_ERR(svn_fs_verify_rev(fs, rev, iterpool));
-
SVN_ERR(svn_fs_revision_root(&to_root, fs, rev, iterpool));
+ SVN_ERR(svn_fs_verify_root(to_root, iterpool));
+
SVN_ERR(svn_repos_replay2(to_root, "", SVN_INVALID_REVNUM, FALSE,
cancel_editor, cancel_edit_baton,
NULL, NULL, iterpool));
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/fs-wrap.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/fs-wrap.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/fs-wrap.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/fs-wrap.c Sat Mar 30 20:02:27 2013
@@ -24,6 +24,7 @@
#include <string.h>
#include <ctype.h>
+#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_error.h"
#include "svn_fs.h"
@@ -108,9 +109,7 @@ svn_repos_fs_begin_txn_for_commit2(svn_f
{
apr_array_header_t *revprops;
const char *txn_name;
- svn_string_t *author = apr_hash_get(revprop_table,
- SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING);
+ svn_string_t *author = svn_hash_gets(revprop_table, SVN_PROP_REVISION_AUTHOR);
/* Begin the transaction, ask for the fs to do on-the-fly lock checks.
We fetch its name, too, so the start-commit hook can use it. */
@@ -142,13 +141,11 @@ svn_repos_fs_begin_txn_for_commit(svn_fs
{
apr_hash_t *revprop_table = apr_hash_make(pool);
if (author)
- apr_hash_set(revprop_table, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING,
- svn_string_create(author, pool));
+ svn_hash_sets(revprop_table, SVN_PROP_REVISION_AUTHOR,
+ svn_string_create(author, pool));
if (log_msg)
- apr_hash_set(revprop_table, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING,
- svn_string_create(log_msg, pool));
+ svn_hash_sets(revprop_table, SVN_PROP_REVISION_LOG,
+ svn_string_create(log_msg, pool));
return svn_repos_fs_begin_txn_for_commit2(txn_p, repos, rev, revprop_table,
pool);
}
@@ -442,17 +439,13 @@ svn_repos_fs_revision_proplist(apr_hash_
/* If they exist, we only copy svn:author and svn:date into the
'real' hashtable being returned. */
- value = apr_hash_get(tmphash, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING);
+ value = svn_hash_gets(tmphash, SVN_PROP_REVISION_AUTHOR);
if (value)
- apr_hash_set(*table_p, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING, value);
+ svn_hash_sets(*table_p, SVN_PROP_REVISION_AUTHOR, value);
- value = apr_hash_get(tmphash, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING);
+ value = svn_hash_gets(tmphash, SVN_PROP_REVISION_DATE);
if (value)
- apr_hash_set(*table_p, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING, value);
+ svn_hash_sets(*table_p, SVN_PROP_REVISION_DATE, value);
}
else /* wholly readable revision */
{
@@ -587,8 +580,8 @@ get_locks_callback(void *baton,
/* If we can read this lock path, add the lock to the return hash. */
if (readable)
- apr_hash_set(b->locks, apr_pstrdup(hash_pool, lock->path),
- APR_HASH_KEY_STRING, svn_lock_dup(lock, hash_pool));
+ svn_hash_sets(b->locks, apr_pstrdup(hash_pool, lock->path),
+ svn_lock_dup(lock, hash_pool));
return SVN_NO_ERROR;
}
@@ -777,8 +770,7 @@ svn_repos_fs_get_inherited_props(apr_arr
if (propval)
{
parent_properties = apr_hash_make(result_pool);
- apr_hash_set(parent_properties, propname,
- APR_HASH_KEY_STRING, propval);
+ svn_hash_sets(parent_properties, propname, propval);
}
}
else
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/hooks.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/hooks.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/hooks.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/hooks.c Sat Mar 30 20:02:27 2013
@@ -27,6 +27,7 @@
#include <apr_pools.h>
#include <apr_file_io.h>
+#include "svn_hash.h"
#include "svn_error.h"
#include "svn_dirent_uri.h"
#include "svn_path.h"
@@ -239,11 +240,10 @@ run_hook_cmd(svn_string_t **result,
* whether a default environment is defined. */
if (hooks_env)
{
- hook_env = apr_hash_get(hooks_env, name, APR_HASH_KEY_STRING);
+ hook_env = svn_hash_gets(hooks_env, name);
if (hook_env == NULL)
- hook_env = apr_hash_get(hooks_env,
- SVN_REPOS__HOOKS_ENV_DEFAULT_SECTION,
- APR_HASH_KEY_STRING);
+ hook_env = svn_hash_gets(hooks_env,
+ SVN_REPOS__HOOKS_ENV_DEFAULT_SECTION);
}
err = svn_io_start_cmd3(&cmd_proc, ".", cmd, args,
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/load-fs-vtable.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/load-fs-vtable.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/load-fs-vtable.c Sat Mar 30 20:02:27 2013
@@ -23,6 +23,7 @@
#include "svn_private_config.h"
+#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_error.h"
#include "svn_fs.h"
@@ -213,7 +214,7 @@ prefix_mergeinfo_paths(svn_string_t **me
path = svn_fspath__canonicalize(svn_relpath_join(parent_dir,
merge_source, pool),
pool);
- apr_hash_set(prefixed_mergeinfo, path, APR_HASH_KEY_STRING, rangelist);
+ svn_hash_sets(prefixed_mergeinfo, path, rangelist);
}
return svn_mergeinfo_to_string(mergeinfo_val, prefixed_mergeinfo, pool);
}
@@ -321,8 +322,7 @@ renumber_mergeinfo_revs(svn_string_t **f
if (SVN_IS_VALID_REVNUM(rev_from_map))
range->end = rev_from_map;
}
- apr_hash_set(final_mergeinfo, merge_source,
- APR_HASH_KEY_STRING, rangelist);
+ svn_hash_sets(final_mergeinfo, merge_source, rangelist);
}
if (predates_stream_mergeinfo)
@@ -366,8 +366,7 @@ make_node_baton(struct node_baton **node
nb->kind = svn_node_unknown;
/* Then add info from the headers. */
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_NODE_PATH,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_PATH)))
{
val = svn_relpath_canonicalize(val, pool);
if (rb->pb->parent_dir)
@@ -376,8 +375,7 @@ make_node_baton(struct node_baton **node
nb->path = val;
}
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_NODE_KIND,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_KIND)))
{
if (! strcmp(val, "file"))
nb->kind = svn_node_file;
@@ -386,8 +384,7 @@ make_node_baton(struct node_baton **node
}
nb->action = (enum svn_node_action)(-1); /* an invalid action code */
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_NODE_ACTION,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_ACTION)))
{
if (! strcmp(val, "change"))
nb->action = svn_node_action_change;
@@ -400,13 +397,11 @@ make_node_baton(struct node_baton **node
}
nb->copyfrom_rev = SVN_INVALID_REVNUM;
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV)))
{
nb->copyfrom_rev = SVN_STR_TO_REV(val);
}
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH)))
{
val = svn_relpath_canonicalize(val, pool);
if (rb->pb->parent_dir)
@@ -415,22 +410,21 @@ make_node_baton(struct node_baton **node
nb->copyfrom_path = val;
}
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM)))
{
SVN_ERR(svn_checksum_parse_hex(&nb->result_checksum, svn_checksum_md5,
val, pool));
}
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM)))
{
SVN_ERR(svn_checksum_parse_hex(&nb->base_checksum, svn_checksum_md5, val,
pool));
}
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM)))
{
SVN_ERR(svn_checksum_parse_hex(&nb->copy_source_checksum,
svn_checksum_md5, val, pool));
@@ -455,8 +449,7 @@ make_revision_baton(apr_hash_t *headers,
rb->pool = pool;
rb->rev = SVN_INVALID_REVNUM;
- if ((val = apr_hash_get(headers, SVN_REPOS_DUMPFILE_REVISION_NUMBER,
- APR_HASH_KEY_STRING)))
+ if ((val = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_REVISION_NUMBER)))
{
rb->rev = SVN_STR_TO_REV(val);
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/load.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/load.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/load.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/load.c Sat Mar 30 20:02:27 2013
@@ -22,6 +22,7 @@
#include "svn_private_config.h"
+#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_error.h"
#include "svn_fs.h"
@@ -127,7 +128,7 @@ read_header_block(svn_stream_t *stream,
value = header_str->data + i;
/* Store name/value in hash. */
- apr_hash_set(*headers, name, APR_HASH_KEY_STRING, value);
+ svn_hash_sets(*headers, name, value);
}
return SVN_NO_ERROR;
@@ -493,8 +494,7 @@ svn_repos_parse_dumpstream3(svn_stream_t
/*** Handle the various header blocks. ***/
/* Is this a revision record? */
- if (apr_hash_get(headers, SVN_REPOS_DUMPFILE_REVISION_NUMBER,
- APR_HASH_KEY_STRING))
+ if (svn_hash_gets(headers, SVN_REPOS_DUMPFILE_REVISION_NUMBER))
{
/* If we already have a rev_baton open, we need to close it
and clear the per-revision subpool. */
@@ -509,8 +509,7 @@ svn_repos_parse_dumpstream3(svn_stream_t
revpool));
}
/* Or is this, perhaps, a node record? */
- else if (apr_hash_get(headers, SVN_REPOS_DUMPFILE_NODE_PATH,
- APR_HASH_KEY_STRING))
+ else if (svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_PATH))
{
SVN_ERR(parse_fns->new_node_record(&node_baton,
headers,
@@ -519,16 +518,14 @@ svn_repos_parse_dumpstream3(svn_stream_t
found_node = TRUE;
}
/* Or is this the repos UUID? */
- else if ((value = apr_hash_get(headers, SVN_REPOS_DUMPFILE_UUID,
- APR_HASH_KEY_STRING)))
+ else if ((value = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_UUID)))
{
SVN_ERR(parse_fns->uuid_record(value, parse_baton, pool));
}
/* Or perhaps a dumpfile format? */
/* ### TODO: use parse_format_version */
- else if ((value = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_MAGIC_HEADER,
- APR_HASH_KEY_STRING)))
+ else if ((value = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_MAGIC_HEADER)))
{
/* ### someday, switch modes of operation here. */
SVN_ERR(svn_cstring_atoi(&version, value));
@@ -547,24 +544,18 @@ svn_repos_parse_dumpstream3(svn_stream_t
and Text-content-length fields, but always have a properties
block in a block with Content-Length > 0 */
- content_length = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_CONTENT_LENGTH,
- APR_HASH_KEY_STRING);
- prop_cl = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH,
- APR_HASH_KEY_STRING);
- text_cl = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH,
- APR_HASH_KEY_STRING);
+ content_length = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
+ prop_cl = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
+ text_cl = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH);
old_v1_with_cl =
version == 1 && content_length && ! prop_cl && ! text_cl;
/* Is there a props content-block to parse? */
if (prop_cl || old_v1_with_cl)
{
- const char *delta = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_PROP_DELTA,
- APR_HASH_KEY_STRING);
+ const char *delta = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_PROP_DELTA);
svn_boolean_t is_delta = (delta && strcmp(delta, "true") == 0);
/* First, remove all node properties, unless this is a delta
@@ -586,9 +577,8 @@ svn_repos_parse_dumpstream3(svn_stream_t
/* Is there a text content-block to parse? */
if (text_cl)
{
- const char *delta = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_TEXT_DELTA,
- APR_HASH_KEY_STRING);
+ const char *delta = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_TEXT_DELTA);
svn_boolean_t is_delta = FALSE;
if (! deltas_are_text)
is_delta = (delta && strcmp(delta, "true") == 0);
@@ -623,9 +613,8 @@ svn_repos_parse_dumpstream3(svn_stream_t
- actual_prop_length;
if (cl_value ||
- ((node_kind = apr_hash_get(headers,
- SVN_REPOS_DUMPFILE_NODE_KIND,
- APR_HASH_KEY_STRING))
+ ((node_kind = svn_hash_gets(headers,
+ SVN_REPOS_DUMPFILE_NODE_KIND))
&& strcmp(node_kind, "file") == 0)
)
SVN_ERR(parse_text_block(stream,
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/log.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/log.c Sat Mar 30 20:02:27 2013
@@ -27,6 +27,7 @@
#include "svn_compat.h"
#include "svn_private_config.h"
+#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_error.h"
#include "svn_path.h"
@@ -340,8 +341,7 @@ detect_changed(apr_hash_t **changed,
}
}
}
- apr_hash_set(*changed, apr_pstrdup(pool, path),
- APR_HASH_KEY_STRING, item);
+ svn_hash_sets(*changed, apr_pstrdup(pool, path), item);
}
svn_pool_destroy(subpool);
@@ -715,8 +715,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
SVN_ERR(svn_fs_get_mergeinfo2(&tmp_catalog, root,
query_paths, svn_mergeinfo_inherited,
FALSE, TRUE, iterpool, iterpool));
- tmp_mergeinfo = apr_hash_get(tmp_catalog, changed_path,
- APR_HASH_KEY_STRING);
+ tmp_mergeinfo = svn_hash_gets(tmp_catalog, changed_path);
if (tmp_mergeinfo)
SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_value,
tmp_mergeinfo,
@@ -734,8 +733,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
SVN_ERR(svn_fs_get_mergeinfo2(&tmp_catalog, base_root,
query_paths, svn_mergeinfo_inherited,
FALSE, TRUE, iterpool, iterpool));
- tmp_mergeinfo = apr_hash_get(tmp_catalog, base_path,
- APR_HASH_KEY_STRING);
+ tmp_mergeinfo = svn_hash_gets(tmp_catalog, base_path);
if (tmp_mergeinfo)
SVN_ERR(svn_mergeinfo_to_string(&prev_mergeinfo_value,
tmp_mergeinfo,
@@ -766,10 +764,8 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
/* Toss interesting stuff into our return catalogs. */
hash_path = apr_pstrdup(result_pool, changed_path);
- apr_hash_set(*deleted_mergeinfo_catalog, hash_path,
- APR_HASH_KEY_STRING, deleted);
- apr_hash_set(*added_mergeinfo_catalog, hash_path,
- APR_HASH_KEY_STRING, added);
+ svn_hash_sets(*deleted_mergeinfo_catalog, hash_path, deleted);
+ svn_hash_sets(*added_mergeinfo_catalog, hash_path, added);
}
}
@@ -858,7 +854,7 @@ get_combined_mergeinfo_changes(svn_merge
/* If this path is represented in the changed-mergeinfo hashes,
we'll deal with it in the loop below. */
- if (apr_hash_get(deleted_mergeinfo_catalog, path, APR_HASH_KEY_STRING))
+ if (svn_hash_gets(deleted_mergeinfo_catalog, path))
continue;
/* Figure out what path/rev to compare against. Ignore
@@ -1080,14 +1076,10 @@ fill_log_entry(svn_log_entry_t *log_entr
{
/* ... but we can only return author/date. */
log_entry->revprops = svn_hash__make(pool);
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING,
- apr_hash_get(r_props, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING));
- apr_hash_set(log_entry->revprops, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING,
- apr_hash_get(r_props, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING));
+ svn_hash_sets(log_entry->revprops, SVN_PROP_REVISION_AUTHOR,
+ svn_hash_gets(r_props, SVN_PROP_REVISION_AUTHOR));
+ svn_hash_sets(log_entry->revprops, SVN_PROP_REVISION_DATE,
+ svn_hash_gets(r_props, SVN_PROP_REVISION_DATE));
}
else
/* ... so return all we got. */
@@ -1100,8 +1092,7 @@ fill_log_entry(svn_log_entry_t *log_entr
for (i = 0; i < revprops->nelts; i++)
{
char *name = APR_ARRAY_IDX(revprops, i, char *);
- svn_string_t *value = apr_hash_get(r_props, name,
- APR_HASH_KEY_STRING);
+ svn_string_t *value = svn_hash_gets(r_props, name);
if (censor_revprops
&& !(strcmp(name, SVN_PROP_REVISION_AUTHOR) == 0
|| strcmp(name, SVN_PROP_REVISION_DATE) == 0))
@@ -1109,8 +1100,7 @@ fill_log_entry(svn_log_entry_t *log_entr
continue;
if (log_entry->revprops == NULL)
log_entry->revprops = svn_hash__make(pool);
- apr_hash_set(log_entry->revprops, name,
- APR_HASH_KEY_STRING, value);
+ svn_hash_sets(log_entry->revprops, name, value);
}
}
}
@@ -1767,8 +1757,7 @@ reduce_search(apr_array_header_t *paths,
for (i = 0; i < paths->nelts; ++i)
{
const char *path = APR_ARRAY_IDX(paths, i, const char *);
- svn_rangelist_t *ranges = apr_hash_get(processed, path,
- APR_HASH_KEY_STRING);
+ svn_rangelist_t *ranges = svn_hash_gets(processed, path);
int j;
if (!ranges)
@@ -1848,8 +1837,7 @@ store_search(svn_mergeinfo_t processed,
range->end = end;
range->inheritable = TRUE;
APR_ARRAY_PUSH(ranges, svn_merge_range_t *) = range;
- apr_hash_set(mergeinfo, apr_pstrdup(processed_pool, path),
- APR_HASH_KEY_STRING, ranges);
+ svn_hash_sets(mergeinfo, apr_pstrdup(processed_pool, path), ranges);
}
SVN_ERR(svn_mergeinfo_merge2(processed, mergeinfo,
apr_hash_pool_get(processed), scratch_pool));
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/replay.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/replay.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/replay.c Sat Mar 30 20:02:27 2013
@@ -218,10 +218,10 @@ add_subdir(svn_fs_root_t *source_root,
changed path (because it was modified after the copy but before the
commit), we remove it from the changed_paths hash so that future
calls to path_driver_cb_func will ignore it. */
- change = apr_hash_get(changed_paths, new_edit_path, APR_HASH_KEY_STRING);
+ change = svn_hash_gets(changed_paths, new_edit_path);
if (change)
{
- apr_hash_set(changed_paths, new_edit_path, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(changed_paths, new_edit_path, NULL);
/* If it's a delete, skip this entry. */
if (change->change_kind == svn_fs_path_change_delete)
@@ -491,7 +491,7 @@ path_driver_cb_func(void **dir_baton,
edit_path))
apr_array_pop(cb->copies);
- change = apr_hash_get(cb->changed_paths, edit_path, APR_HASH_KEY_STRING);
+ change = svn_hash_gets(cb->changed_paths, edit_path);
if (! change)
{
/* This can only happen if the path was removed from cb->changed_paths
@@ -783,14 +783,13 @@ path_driver_cb_func(void **dir_baton,
#ifdef USE_EV2_IMPL
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
svn_fs_root_t *root = baton;
- svn_node_kind_t node_kind;
svn_fs_root_t *prev_root;
svn_fs_t *fs = svn_fs_root_fs(root);
@@ -798,9 +797,8 @@ fetch_kind_func(svn_kind_t *kind,
base_revision = svn_fs_revision_root_revision(root) - 1;
SVN_ERR(svn_fs_revision_root(&prev_root, fs, base_revision, scratch_pool));
- SVN_ERR(svn_fs_check_path(&node_kind, prev_root, path, scratch_pool));
+ SVN_ERR(svn_fs_check_path(kind, prev_root, path, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
@@ -1064,11 +1062,10 @@ add_subdir_ev2(svn_fs_root_t *source_roo
changed path (because it was modified after the copy but before the
commit), we remove it from the changed_paths hash so that future
calls to path_driver_cb_func will ignore it. */
- change = apr_hash_get(changed_paths, child_relpath, APR_HASH_KEY_STRING);
+ change = svn_hash_gets(changed_paths, child_relpath);
if (change)
{
- apr_hash_set(changed_paths, child_relpath, APR_HASH_KEY_STRING,
- NULL);
+ svn_hash_sets(changed_paths, child_relpath, NULL);
/* If it's a delete, skip this entry. */
if (change->change_kind == svn_fs_path_change_delete)
@@ -1193,7 +1190,7 @@ replay_node(svn_fs_root_t *root,
repos_relpath) == NULL) )
apr_array_pop(copies);
- change = apr_hash_get(changed_paths, repos_relpath, APR_HASH_KEY_STRING);
+ change = svn_hash_gets(changed_paths, repos_relpath);
if (! change)
{
/* This can only happen if the path was removed from changed_paths
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/reporter.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/reporter.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/reporter.c Sat Mar 30 20:02:27 2013
@@ -22,6 +22,7 @@
*/
#include "svn_dirent_uri.h"
+#include "svn_hash.h"
#include "svn_path.h"
#include "svn_types.h"
#include "svn_error.h"
@@ -486,12 +487,10 @@ get_revision_info(report_baton_t *b,
scratch_pool));
/* Extract the committed-date. */
- cdate = apr_hash_get(r_props, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING);
+ cdate = svn_hash_gets(r_props, SVN_PROP_REVISION_DATE);
/* Extract the last-author. */
- author = apr_hash_get(r_props, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING);
+ author = svn_hash_gets(r_props, SVN_PROP_REVISION_AUTHOR);
/* Create a result object */
info = apr_palloc(b->pool, sizeof(*info));
@@ -1192,16 +1191,16 @@ delta_dirs(report_baton_t *b, svn_revnum
item is a delete, remove the entry from the source hash,
but don't update the entry yet. */
if (s_entries)
- apr_hash_set(s_entries, name, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(s_entries, name, NULL);
continue;
}
e_fullpath = svn_relpath_join(e_path, name, subpool);
t_fullpath = svn_fspath__join(t_path, name, subpool);
- t_entry = apr_hash_get(t_entries, name, APR_HASH_KEY_STRING);
+ t_entry = svn_hash_gets(t_entries, name);
s_fullpath = s_path ? svn_fspath__join(s_path, name, subpool) : NULL;
s_entry = s_entries ?
- apr_hash_get(s_entries, name, APR_HASH_KEY_STRING) : NULL;
+ svn_hash_gets(s_entries, name) : NULL;
/* The only special cases here are
@@ -1222,12 +1221,12 @@ delta_dirs(report_baton_t *b, svn_revnum
DEPTH_BELOW_HERE(requested_depth), subpool));
/* Don't revisit this name in the target or source entries. */
- apr_hash_set(t_entries, name, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(t_entries, name, NULL);
if (s_entries
/* Keep the entry for later process if it is reported as
excluded and got deleted in repos. */
&& (! info || info->depth != svn_depth_exclude || t_entry))
- apr_hash_set(s_entries, name, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(s_entries, name, NULL);
/* pathinfo entries live in their own subpools due to lookahead,
so we need to clear each one out as we finish with it. */
@@ -1248,8 +1247,7 @@ delta_dirs(report_baton_t *b, svn_revnum
svn_pool_clear(subpool);
s_entry = svn__apr_hash_index_val(hi);
- if (apr_hash_get(t_entries, s_entry->name,
- APR_HASH_KEY_STRING) == NULL)
+ if (svn_hash_gets(t_entries, s_entry->name) == NULL)
{
svn_revnum_t deleted_rev;
@@ -1310,7 +1308,7 @@ delta_dirs(report_baton_t *b, svn_revnum
/* Look for an entry with the same name
in the source dirents. */
s_entry = s_entries ?
- apr_hash_get(s_entries, t_entry->name, APR_HASH_KEY_STRING)
+ svn_hash_gets(s_entries, t_entry->name)
: NULL;
s_fullpath = s_entry ?
svn_fspath__join(s_path, t_entry->name, subpool) : NULL;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.c Sat Mar 30 20:02:27 2013
@@ -1184,15 +1184,15 @@ parse_hooks_env_option(const char *name,
apr_pool_t *result_pool = apr_hash_pool_get(bo->hooks_env);
apr_hash_t *hook_env;
- hook_env = apr_hash_get(bo->hooks_env, bo->section, APR_HASH_KEY_STRING);
+ hook_env = svn_hash_gets(bo->hooks_env, bo->section);
if (hook_env == NULL)
{
hook_env = apr_hash_make(result_pool);
- apr_hash_set(bo->hooks_env, apr_pstrdup(result_pool, bo->section),
- APR_HASH_KEY_STRING, hook_env);
+ svn_hash_sets(bo->hooks_env, apr_pstrdup(result_pool, bo->section),
+ hook_env);
}
- apr_hash_set(hook_env, apr_pstrdup(result_pool, name),
- APR_HASH_KEY_STRING, apr_pstrdup(result_pool, value));
+ svn_hash_sets(hook_env, apr_pstrdup(result_pool, name),
+ apr_pstrdup(result_pool, value));
return TRUE;
}
@@ -1291,10 +1291,8 @@ create_repos_structure(svn_repos_t *repo
/* Create the DAV sandbox directory if pre-1.4 or pre-1.5-compatible. */
if (fs_config
- && (apr_hash_get(fs_config, SVN_FS_CONFIG_PRE_1_4_COMPATIBLE,
- APR_HASH_KEY_STRING)
- || apr_hash_get(fs_config, SVN_FS_CONFIG_PRE_1_5_COMPATIBLE,
- APR_HASH_KEY_STRING)))
+ && (svn_hash_gets(fs_config, SVN_FS_CONFIG_PRE_1_4_COMPATIBLE)
+ || svn_hash_gets(fs_config, SVN_FS_CONFIG_PRE_1_5_COMPATIBLE)))
{
const char *dav_path = svn_dirent_join(repos->path,
SVN_REPOS__DAV_DIR, pool);
@@ -1688,8 +1686,7 @@ svn_repos_has_capability(svn_repos_t *re
const char *capability,
apr_pool_t *pool)
{
- const char *val = apr_hash_get(repos->repository_capabilities,
- capability, APR_HASH_KEY_STRING);
+ const char *val = svn_hash_gets(repos->repository_capabilities, capability);
if (val == capability_yes)
{
@@ -1718,9 +1715,8 @@ svn_repos_has_capability(svn_repos_t *re
if (err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)
{
svn_error_clear(err);
- apr_hash_set(repos->repository_capabilities,
- SVN_REPOS_CAPABILITY_MERGEINFO,
- APR_HASH_KEY_STRING, capability_no);
+ svn_hash_sets(repos->repository_capabilities,
+ SVN_REPOS_CAPABILITY_MERGEINFO, capability_no);
*has = FALSE;
}
else if (err->apr_err == SVN_ERR_FS_NOT_FOUND)
@@ -1729,9 +1725,8 @@ svn_repos_has_capability(svn_repos_t *re
in r0, so we're likely to get this error -- but it
means the repository supports mergeinfo! */
svn_error_clear(err);
- apr_hash_set(repos->repository_capabilities,
- SVN_REPOS_CAPABILITY_MERGEINFO,
- APR_HASH_KEY_STRING, capability_yes);
+ svn_hash_sets(repos->repository_capabilities,
+ SVN_REPOS_CAPABILITY_MERGEINFO, capability_yes);
*has = TRUE;
}
else
@@ -1741,9 +1736,8 @@ svn_repos_has_capability(svn_repos_t *re
}
else
{
- apr_hash_set(repos->repository_capabilities,
- SVN_REPOS_CAPABILITY_MERGEINFO,
- APR_HASH_KEY_STRING, capability_yes);
+ svn_hash_sets(repos->repository_capabilities,
+ SVN_REPOS_CAPABILITY_MERGEINFO, capability_yes);
*has = TRUE;
}
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_repos/rev_hunt.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_repos/rev_hunt.c Sat Mar 30 20:02:27 2013
@@ -25,6 +25,7 @@
#include <string.h>
#include "svn_compat.h"
#include "svn_private_config.h"
+#include "svn_hash.h"
#include "svn_pools.h"
#include "svn_error.h"
#include "svn_error_codes.h"
@@ -1005,7 +1006,7 @@ get_path_mergeinfo(apr_hash_t **mergeinf
svn_mergeinfo_inherited, FALSE, TRUE,
result_pool, scratch_pool));
- *mergeinfo = apr_hash_get(tmp_catalog, path, APR_HASH_KEY_STRING);
+ *mergeinfo = svn_hash_gets(tmp_catalog, path);
if (!*mergeinfo)
*mergeinfo = apr_hash_make(result_pool);
@@ -1021,7 +1022,7 @@ is_path_in_hash(apr_hash_t *duplicate_pa
const char *key = apr_psprintf(pool, "%s:%ld", path, revision);
void *ptr;
- ptr = apr_hash_get(duplicate_path_revs, key, APR_HASH_KEY_STRING);
+ ptr = svn_hash_gets(duplicate_path_revs, key);
return ptr != NULL;
}
@@ -1060,9 +1061,7 @@ get_merged_mergeinfo(apr_hash_t **merged
SVN_ERR(svn_fs_paths_changed2(&changed_paths, root, scratch_pool));
while (1)
{
- svn_fs_path_change2_t *changed_path = apr_hash_get(changed_paths,
- path,
- APR_HASH_KEY_STRING);
+ svn_fs_path_change2_t *changed_path = svn_hash_gets(changed_paths, path);
if (changed_path && changed_path->prop_mod)
break;
if (svn_fspath__is_root(path, strlen(path)))
@@ -1211,10 +1210,10 @@ find_interesting_revisions(apr_array_hea
/* Add the path/rev pair to the hash, so we can filter out future
occurrences of it. We only care about this if including merged
revisions, 'cause that's the only time we can have duplicates. */
- apr_hash_set(duplicate_path_revs,
- apr_psprintf(result_pool, "%s:%ld", path_rev->path,
- path_rev->revnum),
- APR_HASH_KEY_STRING, (void *)0xdeadbeef);
+ svn_hash_sets(duplicate_path_revs,
+ apr_psprintf(result_pool, "%s:%ld", path_rev->path,
+ path_rev->revnum),
+ (void *)0xdeadbeef);
if (path_rev->revnum <= start)
break;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c Sat Mar 30 20:02:27 2013
@@ -26,6 +26,7 @@
#include <apr_tables.h>
#include <apr_strings.h>
+#include "svn_hash.h"
#include "svn_types.h"
#include "svn_string.h"
#include "svn_error.h"
@@ -151,17 +152,14 @@ svn_auth_open(svn_auth_baton_t **auth_ba
provider = APR_ARRAY_IDX(providers, i, svn_auth_provider_object_t *);
/* Add it to the appropriate table in the auth_baton */
- table = apr_hash_get(ab->tables,
- provider->vtable->cred_kind, APR_HASH_KEY_STRING);
+ table = svn_hash_gets(ab->tables, provider->vtable->cred_kind);
if (! table)
{
table = apr_pcalloc(pool, sizeof(*table));
table->providers
= apr_array_make(pool, 1, sizeof(svn_auth_provider_object_t *));
- apr_hash_set(ab->tables,
- provider->vtable->cred_kind, APR_HASH_KEY_STRING,
- table);
+ svn_hash_sets(ab->tables, provider->vtable->cred_kind, table);
}
APR_ARRAY_PUSH(table->providers, svn_auth_provider_object_t *)
= provider;
@@ -177,14 +175,14 @@ svn_auth_set_parameter(svn_auth_baton_t
const char *name,
const void *value)
{
- apr_hash_set(auth_baton->parameters, name, APR_HASH_KEY_STRING, value);
+ svn_hash_sets(auth_baton->parameters, name, value);
}
const void *
svn_auth_get_parameter(svn_auth_baton_t *auth_baton,
const char *name)
{
- return apr_hash_get(auth_baton->parameters, name, APR_HASH_KEY_STRING);
+ return svn_hash_gets(auth_baton->parameters, name);
}
@@ -207,7 +205,7 @@ svn_auth_first_credentials(void **creden
const char *cache_key;
/* Get the appropriate table of providers for CRED_KIND. */
- table = apr_hash_get(auth_baton->tables, cred_kind, APR_HASH_KEY_STRING);
+ table = svn_hash_gets(auth_baton->tables, cred_kind);
if (! table)
return svn_error_createf(SVN_ERR_AUTHN_NO_PROVIDER, NULL,
_("No provider registered for '%s' credentials"),
@@ -215,8 +213,7 @@ svn_auth_first_credentials(void **creden
/* First, see if we have cached creds in the auth_baton. */
cache_key = apr_pstrcat(pool, cred_kind, ":", realmstring, (char *)NULL);
- creds = apr_hash_get(auth_baton->creds_cache,
- cache_key, APR_HASH_KEY_STRING);
+ creds = svn_hash_gets(auth_baton->creds_cache, cache_key);
if (creds)
{
got_first = FALSE;
@@ -229,9 +226,11 @@ svn_auth_first_credentials(void **creden
{
provider = APR_ARRAY_IDX(table->providers, i,
svn_auth_provider_object_t *);
- SVN_ERR(provider->vtable->first_credentials
- (&creds, &iter_baton, provider->provider_baton,
- auth_baton->parameters, realmstring, auth_baton->pool));
+ SVN_ERR(provider->vtable->first_credentials(&creds, &iter_baton,
+ provider->provider_baton,
+ auth_baton->parameters,
+ realmstring,
+ auth_baton->pool));
if (creds != NULL)
{
@@ -257,10 +256,9 @@ svn_auth_first_credentials(void **creden
*state = iterstate;
/* Put the creds in the cache */
- apr_hash_set(auth_baton->creds_cache,
- apr_pstrdup(auth_baton->pool, cache_key),
- APR_HASH_KEY_STRING,
- creds);
+ svn_hash_sets(auth_baton->creds_cache,
+ apr_pstrdup(auth_baton->pool, cache_key),
+ creds);
}
*credentials = creds;
@@ -289,27 +287,24 @@ svn_auth_next_credentials(void **credent
svn_auth_provider_object_t *);
if (! state->got_first)
{
- SVN_ERR(provider->vtable->first_credentials
- (&creds, &(state->provider_iter_baton),
- provider->provider_baton, auth_baton->parameters,
- state->realmstring, auth_baton->pool));
+ SVN_ERR(provider->vtable->first_credentials(
+ &creds, &(state->provider_iter_baton),
+ provider->provider_baton, auth_baton->parameters,
+ state->realmstring, auth_baton->pool));
state->got_first = TRUE;
}
- else
+ else if (provider->vtable->next_credentials)
{
- if (provider->vtable->next_credentials)
- SVN_ERR(provider->vtable->next_credentials
- (&creds, state->provider_iter_baton,
- provider->provider_baton, auth_baton->parameters,
- state->realmstring, auth_baton->pool));
+ SVN_ERR(provider->vtable->next_credentials(
+ &creds, state->provider_iter_baton,
+ provider->provider_baton, auth_baton->parameters,
+ state->realmstring, auth_baton->pool));
}
if (creds != NULL)
{
/* Put the creds in the cache */
- apr_hash_set(auth_baton->creds_cache,
- state->cache_key, APR_HASH_KEY_STRING,
- creds);
+ svn_hash_sets(auth_baton->creds_cache, state->cache_key, creds);
break;
}
@@ -337,15 +332,13 @@ svn_auth_save_credentials(svn_auth_iters
return SVN_NO_ERROR;
auth_baton = state->auth_baton;
- creds = apr_hash_get(state->auth_baton->creds_cache,
- state->cache_key, APR_HASH_KEY_STRING);
+ creds = svn_hash_gets(state->auth_baton->creds_cache, state->cache_key);
if (! creds)
return SVN_NO_ERROR;
/* Do not save the creds if SVN_AUTH_PARAM_NO_AUTH_CACHE is set */
- no_auth_cache = apr_hash_get(auth_baton->parameters,
- SVN_AUTH_PARAM_NO_AUTH_CACHE,
- APR_HASH_KEY_STRING);
+ no_auth_cache = svn_hash_gets(auth_baton->parameters,
+ SVN_AUTH_PARAM_NO_AUTH_CACHE);
if (no_auth_cache)
return SVN_NO_ERROR;
@@ -629,7 +622,7 @@ svn_auth_cleanup_walk(svn_auth_baton_t *
apr_pool_t *scratch_pool)
{
- if (apr_hash_get(baton->tables, SVN_AUTH_CRED_SIMPLE, APR_HASH_KEY_STRING))
+ if (svn_hash_gets(baton->tables, SVN_AUTH_CRED_SIMPLE))
{
SVN_ERR(svn_auth__simple_cleanup_walk(baton, cleanup, cleanup_baton,
baton->creds_cache, scratch_pool));
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/cache-membuffer.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/cache-membuffer.c Sat Mar 30 20:02:27 2013
@@ -116,11 +116,11 @@
/* By default, don't create cache segments smaller than this value unless
* the total cache size itself is smaller.
*/
-#define DEFAULT_MIN_SEGMENT_SIZE 0x2000000ull
+#define DEFAULT_MIN_SEGMENT_SIZE APR_UINT64_C(0x2000000)
/* The minimum segment size we will allow for multi-segmented caches
*/
-#define MIN_SEGMENT_SIZE 0x10000ull
+#define MIN_SEGMENT_SIZE APR_UINT64_C(0x10000)
/* The maximum number of segments allowed. Larger numbers reduce the size
* of each segment, in turn reducing the max size of a cachable item.
@@ -133,7 +133,7 @@
/* As of today, APR won't allocate chunks of 4GB or more. So, limit the
* segment size to slightly below that.
*/
-#define MAX_SEGMENT_SIZE 0xffff0000ull
+#define MAX_SEGMENT_SIZE APR_UINT64_C(0xffff0000)
/* We don't mark the initialization status for every group but initialize
* a number of groups at once. That will allow for a very small init flags
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/cache.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/cache.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/cache.c Sat Mar 30 20:02:27 2013
@@ -75,6 +75,10 @@ svn_cache__get(void **value_p,
/* In case any errors happen and are quelched, make sure we start
out with FOUND set to false. */
*found = FALSE;
+#ifdef SVN_DEBUG
+ if (getenv("SVN_X_DOES_NOT_MARK_THE_SPOT"))
+ return SVN_NO_ERROR;
+#endif
cache->reads++;
err = handle_error(cache,
@@ -129,6 +133,12 @@ svn_cache__iter(svn_boolean_t *completed
void *user_baton,
apr_pool_t *scratch_pool)
{
+#ifdef SVN_DEBUG
+ if (getenv("SVN_X_DOES_NOT_MARK_THE_SPOT"))
+ /* Pretend CACHE is empty. */
+ return SVN_NO_ERROR;
+#endif
+
return (cache->vtable->iter)(completed,
cache->cache_internal,
user_cb,
@@ -150,6 +160,10 @@ svn_cache__get_partial(void **value,
/* In case any errors happen and are quelched, make sure we start
out with FOUND set to false. */
*found = FALSE;
+#ifdef SVN_DEBUG
+ if (getenv("SVN_X_DOES_NOT_MARK_THE_SPOT"))
+ return SVN_NO_ERROR;
+#endif
cache->reads++;
err = handle_error(cache,
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c Sat Mar 30 20:02:27 2013
@@ -46,6 +46,7 @@
#include "svn_ctype.h"
#include "svn_dso.h"
#include "svn_dirent_uri.h"
+#include "svn_hash.h"
#include "svn_path.h"
#include "svn_pools.h"
#include "svn_error.h"
@@ -144,7 +145,9 @@ svn_cmdline_init(const char *progname, F
_set_error_mode(_OUT_TO_STDERR);
/* In _DEBUG mode: Redirect all debug output (E.g. assert() to stderr.
- (Ignored in releas builds) */
+ (Ignored in release builds) */
+ _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR);
+ _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR);
_CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR);
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
@@ -747,7 +750,7 @@ svn_cmdline__apply_config_options(apr_ha
APR_ARRAY_IDX(config_options, i,
svn_cmdline__config_argument_t *);
- cfg = apr_hash_get(config, arg->file, APR_HASH_KEY_STRING);
+ cfg = svn_hash_gets(config, arg->file);
if (cfg)
{
@@ -973,8 +976,7 @@ find_editor_binary(const char **editor,
/* If not found then fall back on the config file. */
if (! e)
{
- cfg = config ? apr_hash_get(config, SVN_CONFIG_CATEGORY_CONFIG,
- APR_HASH_KEY_STRING) : NULL;
+ cfg = config ? svn_hash_gets(config, SVN_CONFIG_CATEGORY_CONFIG) : NULL;
svn_config_get(cfg, &e, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_EDITOR_CMD, NULL);
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/compat.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/compat.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/compat.c Sat Mar 30 20:02:27 2013
@@ -24,6 +24,7 @@
#include <apr_pools.h>
#include <apr_strings.h>
+#include "svn_hash.h"
#include "svn_types.h"
#include "svn_error.h"
#include "svn_compat.h"
@@ -75,12 +76,9 @@ svn_compat_log_revprops_clear(apr_hash_t
{
if (revprops)
{
- apr_hash_set(revprops, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING, NULL);
- apr_hash_set(revprops, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING, NULL);
- apr_hash_set(revprops, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(revprops, SVN_PROP_REVISION_AUTHOR, NULL);
+ svn_hash_sets(revprops, SVN_PROP_REVISION_DATE, NULL);
+ svn_hash_sets(revprops, SVN_PROP_REVISION_LOG, NULL);
}
}
@@ -105,14 +103,11 @@ svn_compat_log_revprops_out(const char *
*author = *date = *message = NULL;
if (revprops)
{
- if ((author_s = apr_hash_get(revprops, SVN_PROP_REVISION_AUTHOR,
- APR_HASH_KEY_STRING)))
+ if ((author_s = svn_hash_gets(revprops, SVN_PROP_REVISION_AUTHOR)))
*author = author_s->data;
- if ((date_s = apr_hash_get(revprops, SVN_PROP_REVISION_DATE,
- APR_HASH_KEY_STRING)))
+ if ((date_s = svn_hash_gets(revprops, SVN_PROP_REVISION_DATE)))
*date = date_s->data;
- if ((message_s = apr_hash_get(revprops, SVN_PROP_REVISION_LOG,
- APR_HASH_KEY_STRING)))
+ if ((message_s = svn_hash_gets(revprops, SVN_PROP_REVISION_LOG)))
*message = message_s->data;
}
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/config.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/config.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/config.c Sat Mar 30 20:02:27 2013
@@ -29,6 +29,7 @@
#include <apr_general.h>
#include <apr_lib.h>
+#include "svn_hash.h"
#include "svn_error.h"
#include "svn_pools.h"
#include "config_impl.h"
@@ -589,7 +590,7 @@ svn_config_addsection(svn_config_t *cfg,
else
s->hash_key = make_hash_key(apr_pstrdup(cfg->pool, section));
s->options = apr_hash_make(cfg->pool);
- apr_hash_set(cfg->sections, s->hash_key, APR_HASH_KEY_STRING, s);
+ svn_hash_sets(cfg->sections, s->hash_key, s);
*sec = s;
}
@@ -677,7 +678,7 @@ svn_config_set(svn_config_t *cfg,
svn_config_addsection(cfg, section, &sec);
}
- apr_hash_set(sec->options, opt->hash_key, APR_HASH_KEY_STRING, opt);
+ svn_hash_sets(sec->options, opt->hash_key, opt);
}
@@ -1170,6 +1171,6 @@ svn_config_has_section(svn_config_t *cfg
if (! cfg->section_names_case_sensitive)
make_hash_key(cfg->tmp_key->data);
- sec = apr_hash_get(cfg->sections, cfg->tmp_key->data, APR_HASH_KEY_STRING);
+ sec = svn_hash_gets(cfg->sections, cfg->tmp_key->data);
return sec != NULL;
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/config_auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/config_auth.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/config_auth.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/config_auth.c Sat Mar 30 20:02:27 2013
@@ -128,8 +128,8 @@ svn_config_write_auth_data(apr_hash_t *h
/* Add the realmstring to the hash, so programs (or users) can
verify exactly which set of credentials this file holds. */
- apr_hash_set(hash, SVN_CONFIG_REALMSTRING_KEY, APR_HASH_KEY_STRING,
- svn_string_create(realmstring, pool));
+ svn_hash_sets(hash, SVN_CONFIG_REALMSTRING_KEY,
+ svn_string_create(realmstring, pool));
SVN_ERR_W(svn_io_file_open(&authfile, auth_path,
(APR_WRITE | APR_CREATE | APR_TRUNCATE
@@ -146,7 +146,7 @@ svn_config_write_auth_data(apr_hash_t *h
/* To be nice, remove the realmstring from the hash again, just in
case the caller wants their hash unchanged. */
- apr_hash_set(hash, SVN_CONFIG_REALMSTRING_KEY, APR_HASH_KEY_STRING, NULL);
+ svn_hash_sets(hash, SVN_CONFIG_REALMSTRING_KEY, NULL);
return SVN_NO_ERROR;
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/debug.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/debug.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/debug.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/debug.c Sat Mar 30 20:02:27 2013
@@ -32,6 +32,9 @@
#include "svn_types.h"
#include "svn_string.h"
+#ifndef SVN_DBG__PROTOTYPES
+#define SVN_DBG__PROTOTYPES
+#endif
#include "private/svn_debug.h"
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c Sat Mar 30 20:02:27 2013
@@ -32,6 +32,7 @@
deprecated functions in this file. */
#define SVN_DEPRECATED
+#include "svn_hash.h"
#include "svn_subst.h"
#include "svn_path.h"
#include "svn_opt.h"
@@ -72,38 +73,28 @@ kwstruct_to_kwhash(const svn_subst_keywo
if (kwstruct->revision)
{
- apr_hash_set(kwhash, SVN_KEYWORD_REVISION_LONG,
- APR_HASH_KEY_STRING, kwstruct->revision);
- apr_hash_set(kwhash, SVN_KEYWORD_REVISION_MEDIUM,
- APR_HASH_KEY_STRING, kwstruct->revision);
- apr_hash_set(kwhash, SVN_KEYWORD_REVISION_SHORT,
- APR_HASH_KEY_STRING, kwstruct->revision);
+ svn_hash_sets(kwhash, SVN_KEYWORD_REVISION_LONG, kwstruct->revision);
+ svn_hash_sets(kwhash, SVN_KEYWORD_REVISION_MEDIUM, kwstruct->revision);
+ svn_hash_sets(kwhash, SVN_KEYWORD_REVISION_SHORT, kwstruct->revision);
}
if (kwstruct->date)
{
- apr_hash_set(kwhash, SVN_KEYWORD_DATE_LONG,
- APR_HASH_KEY_STRING, kwstruct->date);
- apr_hash_set(kwhash, SVN_KEYWORD_DATE_SHORT,
- APR_HASH_KEY_STRING, kwstruct->date);
+ svn_hash_sets(kwhash, SVN_KEYWORD_DATE_LONG, kwstruct->date);
+ svn_hash_sets(kwhash, SVN_KEYWORD_DATE_SHORT, kwstruct->date);
}
if (kwstruct->author)
{
- apr_hash_set(kwhash, SVN_KEYWORD_AUTHOR_LONG,
- APR_HASH_KEY_STRING, kwstruct->author);
- apr_hash_set(kwhash, SVN_KEYWORD_AUTHOR_SHORT,
- APR_HASH_KEY_STRING, kwstruct->author);
+ svn_hash_sets(kwhash, SVN_KEYWORD_AUTHOR_LONG, kwstruct->author);
+ svn_hash_sets(kwhash, SVN_KEYWORD_AUTHOR_SHORT, kwstruct->author);
}
if (kwstruct->url)
{
- apr_hash_set(kwhash, SVN_KEYWORD_URL_LONG,
- APR_HASH_KEY_STRING, kwstruct->url);
- apr_hash_set(kwhash, SVN_KEYWORD_URL_SHORT,
- APR_HASH_KEY_STRING, kwstruct->url);
+ svn_hash_sets(kwhash, SVN_KEYWORD_URL_LONG, kwstruct->url);
+ svn_hash_sets(kwhash, SVN_KEYWORD_URL_SHORT, kwstruct->url);
}
if (kwstruct->id)
{
- apr_hash_set(kwhash, SVN_KEYWORD_ID,
- APR_HASH_KEY_STRING, kwstruct->id);
+ svn_hash_sets(kwhash, SVN_KEYWORD_ID, kwstruct->id);
}
return kwhash;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/dso.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/dso.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/dso.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/dso.c Sat Mar 30 20:02:27 2013
@@ -22,6 +22,7 @@
#include <apr_thread_mutex.h>
#include <apr_hash.h>
+#include "svn_hash.h"
#include "svn_dso.h"
#include "svn_pools.h"
#include "svn_private_config.h"
@@ -64,7 +65,7 @@ svn_dso_initialize2(void)
static svn_error_t *
svn_dso_load_internal(apr_dso_handle_t **dso, const char *fname)
{
- *dso = apr_hash_get(dso_cache, fname, APR_HASH_KEY_STRING);
+ *dso = svn_hash_gets(dso_cache, fname);
/* First check to see if we've been through this before... We do this
to avoid calling apr_dso_load multiple times for a given library,
@@ -91,19 +92,13 @@ svn_dso_load_internal(apr_dso_handle_t *
*dso = NULL;
/* It wasn't found, so set the special "we didn't find it" value. */
- apr_hash_set(dso_cache,
- apr_pstrdup(dso_pool, fname),
- APR_HASH_KEY_STRING,
- NOT_THERE);
+ svn_hash_sets(dso_cache, apr_pstrdup(dso_pool, fname), NOT_THERE);
return SVN_NO_ERROR;
}
/* Stash the dso so we can use it next time. */
- apr_hash_set(dso_cache,
- apr_pstrdup(dso_pool, fname),
- APR_HASH_KEY_STRING,
- *dso);
+ svn_hash_sets(dso_cache, apr_pstrdup(dso_pool, fname), *dso);
}
return SVN_NO_ERROR;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c Sat Mar 30 20:02:27 2013
@@ -30,6 +30,9 @@
#include <zlib.h>
+#ifndef SVN_ERR__TRACING
+#define SVN_ERR__TRACING
+#endif
#include "svn_cmdline.h"
#include "svn_error.h"
#include "svn_pools.h"