You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gb...@apache.org on 2013/10/24 17:11:08 UTC
svn commit: r1535404 [3/3] - in
/subversion/branches/invoke-diff-cmd-feature: ./ build/generator/
notes/http-and-webdav/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/types/
subversion/bindings/swig/ruby...
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Thu Oct 24 15:11:06 2013
@@ -288,7 +288,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack", NULL);
+ "pack", (char *)NULL);
/* These files should exist. */
SVN_ERR(svn_io_check_path(path, &kind, pool));
@@ -300,7 +300,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "manifest", NULL);
+ "manifest", (char *)NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -311,7 +311,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack.l2p", NULL);
+ "pack.l2p", (char *)NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -320,7 +320,7 @@ pack_filesystem(const svn_test_opts_t *o
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack.p2l", NULL);
+ "pack.p2l", (char *)NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -331,7 +331,7 @@ pack_filesystem(const svn_test_opts_t *o
/* This directory should not exist. */
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d", i / SHARD_SIZE),
- NULL);
+ (char *)NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -353,7 +353,7 @@ pack_filesystem(const svn_test_opts_t *o
/* Finally, make sure the final revision directory does exist. */
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d", (i / SHARD_SIZE) + 1),
- NULL);
+ (char *)NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -385,7 +385,7 @@ pack_even_filesystem(const svn_test_opts
SVN_ERR(create_packed_filesystem(REPO_NAME, opts, MAX_REV, SHARD_SIZE,
pool));
- path = svn_dirent_join_many(pool, REPO_NAME, "revs", "2.pack", NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs", "2.pack", (char *)NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_dir)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -724,7 +724,7 @@ recover_fully_packed(const svn_test_opts
apr_psprintf(pool, "%ld/%ld",
after_rev / SHARD_SIZE,
after_rev),
- NULL),
+ (char *)NULL),
FALSE, pool));
err = svn_fs_recover(REPO_NAME, NULL, NULL, pool);
if (! err)
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/auth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/auth-test.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/auth-test.c Thu Oct 24 15:11:06 2013
@@ -63,13 +63,14 @@ test_platform_specific_auth_providers(ap
number_of_providers += 2;
#endif
#if defined(WIN32) && !defined(__MINGW32__)
- number_of_providers += 2;
+ number_of_providers += 4;
#endif
if (providers->nelts != number_of_providers)
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
"svn_auth_get_platform_specific_client_providers should return " \
- "an array of %d providers", number_of_providers);
+ "an array of %d providers, but returned %d providers",
+ number_of_providers, providers->nelts);
/* Test Keychain auth providers */
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Oct 24 15:11:06 2013
@@ -269,7 +269,7 @@ test_dirent_join(apr_pool_t *pool)
"\"%s\". expected \"%s\"",
base, comp, result, expect);
- result = svn_dirent_join_many(pool, base, comp, NULL);
+ result = svn_dirent_join_many(pool, base, comp, (char *)NULL);
if (strcmp(result, expect))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_dirent_join_many(\"%s\", \"%s\") returned "
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/path-test.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/path-test.c Thu Oct 24 15:11:06 2013
@@ -489,7 +489,7 @@ test_path_join(apr_pool_t *pool)
if (svn_path_is_url(base))
continue;
- result = svn_path_join_many(pool, base, comp, NULL);
+ result = svn_path_join_many(pool, base, comp, (char *)NULL);
if (strcmp(result, expect))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_path_join_many(\"%s\", \"%s\") returned "
Modified: subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/entries-compat.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/entries-compat.c Thu Oct 24 15:11:06 2013
@@ -377,7 +377,7 @@ test_entries_alloc(apr_pool_t *pool)
"fake-wc",
WC_NAME,
"D",
- NULL);
+ (char *)NULL);
SVN_ERR(svn_wc_entry(&entry, local_relpath, adm_access, TRUE, pool));
SVN_TEST_ASSERT(entry == apr_hash_get(entries, "D", APR_HASH_KEY_STRING));
@@ -413,7 +413,7 @@ test_stubs(apr_pool_t *pool)
"fake-wc",
WC_NAME,
"M",
- NULL);
+ (char *)NULL);
SVN_ERR(svn_wc_adm_open3(&adm_access,
NULL /* associated */,
Modified: subversion/branches/invoke-diff-cmd-feature/tools/dev/fsfs-reorg.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/dev/fsfs-reorg.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/dev/fsfs-reorg.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/dev/fsfs-reorg.c Thu Oct 24 15:11:06 2013
@@ -1391,8 +1391,8 @@ get_combined_window(svn_stringbuf_t **co
apr_array_header_t *windows;
svn_stringbuf_t *base_content, *result;
const char *source;
- apr_pool_t *sub_pool;
- apr_pool_t *iter_pool;
+ apr_pool_t *subpool;
+ apr_pool_t *iterpool;
/* special case: no un-deltification necessary */
if (representation->is_plain)
@@ -1404,16 +1404,16 @@ get_combined_window(svn_stringbuf_t **co
return SVN_NO_ERROR;
/* read the delta windows for this representation */
- sub_pool = svn_pool_create(pool);
- iter_pool = svn_pool_create(pool);
- SVN_ERR(read_windows(&windows, fs, representation, sub_pool));
+ subpool = svn_pool_create(pool);
+ iterpool = svn_pool_create(pool);
+ SVN_ERR(read_windows(&windows, fs, representation, subpool));
/* fetch the / create a base content */
if (representation->delta_base && representation->delta_base->revision)
SVN_ERR(get_combined_window(&base_content, fs,
- representation->delta_base, sub_pool));
+ representation->delta_base, subpool));
else
- base_content = svn_stringbuf_create_empty(sub_pool);
+ base_content = svn_stringbuf_create_empty(subpool);
/* apply deltas */
result = svn_stringbuf_create_empty(pool);
@@ -1424,7 +1424,7 @@ get_combined_window(svn_stringbuf_t **co
svn_txdelta_window_t *window
= APR_ARRAY_IDX(windows, i, svn_txdelta_window_t *);
svn_stringbuf_t *buf
- = svn_stringbuf_create_ensure(window->tview_len, iter_pool);
+ = svn_stringbuf_create_ensure(window->tview_len, iterpool);
buf->len = window->tview_len;
svn_txdelta_apply_instructions(window, window->src_ops ? source : NULL,
@@ -1433,11 +1433,11 @@ get_combined_window(svn_stringbuf_t **co
svn_stringbuf_appendbytes(result, buf->data, buf->len);
source += window->sview_len;
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
}
- svn_pool_destroy(iter_pool);
- svn_pool_destroy(sub_pool);
+ svn_pool_destroy(iterpool);
+ svn_pool_destroy(subpool);
/* cache result and return it */
set_cached_window(fs, representation, result);
Modified: subversion/branches/invoke-diff-cmd-feature/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/server-side/fsfs-stats.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/server-side/fsfs-stats.c Thu Oct 24 15:11:06 2013
@@ -1135,8 +1135,8 @@ get_combined_window(svn_stringbuf_t **co
apr_array_header_t *windows;
svn_stringbuf_t *base_content, *result;
const char *source;
- apr_pool_t *sub_pool;
- apr_pool_t *iter_pool;
+ apr_pool_t *subpool;
+ apr_pool_t *iterpool;
/* special case: no un-deltification necessary */
if (representation->is_plain)
@@ -1153,16 +1153,16 @@ get_combined_window(svn_stringbuf_t **co
return SVN_NO_ERROR;
/* read the delta windows for this representation */
- sub_pool = svn_pool_create(pool);
- iter_pool = svn_pool_create(pool);
- SVN_ERR(read_windows(&windows, fs, representation, file_content, sub_pool));
+ subpool = svn_pool_create(pool);
+ iterpool = svn_pool_create(pool);
+ SVN_ERR(read_windows(&windows, fs, representation, file_content, subpool));
/* fetch the / create a base content */
if (representation->delta_base && representation->delta_base->revision)
SVN_ERR(get_combined_window(&base_content, fs,
- representation->delta_base, NULL, sub_pool));
+ representation->delta_base, NULL, subpool));
else
- base_content = svn_stringbuf_create_empty(sub_pool);
+ base_content = svn_stringbuf_create_empty(subpool);
/* apply deltas */
result = svn_stringbuf_create_empty(pool);
@@ -1173,7 +1173,7 @@ get_combined_window(svn_stringbuf_t **co
svn_txdelta_window_t *window
= APR_ARRAY_IDX(windows, i, svn_txdelta_window_t *);
svn_stringbuf_t *buf
- = svn_stringbuf_create_ensure(window->tview_len, iter_pool);
+ = svn_stringbuf_create_ensure(window->tview_len, iterpool);
buf->len = window->tview_len;
svn_txdelta_apply_instructions(window, window->src_ops ? source : NULL,
@@ -1182,15 +1182,15 @@ get_combined_window(svn_stringbuf_t **co
svn_stringbuf_appendbytes(result, buf->data, buf->len);
source += window->sview_len;
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
}
/* cache result and return it */
- SVN_ERR(set_cached_window(fs, representation, result, sub_pool));
+ SVN_ERR(set_cached_window(fs, representation, result, subpool));
*content = result;
- svn_pool_destroy(iter_pool);
- svn_pool_destroy(sub_pool);
+ svn_pool_destroy(iterpool);
+ svn_pool_destroy(subpool);
return SVN_NO_ERROR;
}
@@ -1219,7 +1219,7 @@ parse_dir(fs_fs_t *fs,
apr_pool_t *scratch_pool)
{
svn_stringbuf_t *text;
- apr_pool_t *iter_pool;
+ apr_pool_t *iterpool;
apr_pool_t *text_pool;
const char *current;
const char *revision_key;
@@ -1230,7 +1230,7 @@ parse_dir(fs_fs_t *fs,
return SVN_NO_ERROR;
/* get the directory as unparsed string */
- iter_pool = svn_pool_create(scratch_pool);
+ iterpool = svn_pool_create(scratch_pool);
text_pool = svn_pool_create(scratch_pool);
SVN_ERR(get_combined_window(&text, fs, representation, file_content,
@@ -1271,14 +1271,14 @@ parse_dir(fs_fs_t *fs,
SVN_ERR(svn_cstring_strtoui64(&offset, current + key_len, 0,
APR_SIZE_MAX, 10));
SVN_ERR(read_noderev(fs, file_content, (apr_size_t)offset,
- revision_info, pool, iter_pool));
+ revision_info, pool, iterpool));
- svn_pool_clear(iter_pool);
+ svn_pool_clear(iterpool);
}
current = next+1;
}
- svn_pool_destroy(iter_pool);
+ svn_pool_destroy(iterpool);
svn_pool_destroy(text_pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-populate-node-origins-index.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-populate-node-origins-index.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-populate-node-origins-index.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-populate-node-origins-index.c Thu Oct 24 15:11:06 2013
@@ -77,8 +77,7 @@ index_revision_adds(int *count, svn_fs_t
*count = 0;
SVN_ERR(svn_fs_revision_root(&root, fs, revision, pool));
- SVN_ERR(svn_fs_paths_changed3(&changes, root,
- svn_move_behavior_explicit_moves, pool));
+ SVN_ERR(svn_fs_paths_changed2(&changes, root, pool));
/* No paths changed in this revision? Nothing to do. */
if (apr_hash_count(changes) == 0)
Modified: subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-rep-sharing-stats.c?rev=1535404&r1=1535403&r2=1535404&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-rep-sharing-stats.c Thu Oct 24 15:11:06 2013
@@ -269,9 +269,7 @@ process_one_revision(svn_fs_t *fs,
/* Get the changed paths. */
SVN_ERR(svn_fs_revision_root(&rev_root, fs, revnum, scratch_pool));
- SVN_ERR(svn_fs_paths_changed3(&paths_changed, rev_root,
- svn_move_behavior_explicit_moves,
- scratch_pool));
+ SVN_ERR(svn_fs_paths_changed2(&paths_changed, rev_root, scratch_pool));
/* Iterate them. */
/* ### use iterpool? */