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/10/30 02:04:26 UTC
svn commit: r1536949 [6/6] - in /subversion/branches/fsfs-improvements: ./
build/ build/ac-macros/ build/generator/ notes/http-and-webdav/
subversion/bindings/javahl/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversi...
Modified: subversion/branches/fsfs-improvements/tools/client-side/svn-bench/notify.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/tools/client-side/svn-bench/notify.c?rev=1536949&r1=1536948&r2=1536949&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/tools/client-side/svn-bench/notify.c (original)
+++ subversion/branches/fsfs-improvements/tools/client-side/svn-bench/notify.c Wed Oct 30 01:04:22 2013
@@ -348,7 +348,7 @@ notify(void *baton, const svn_wc_notify_
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu (%s)\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -365,7 +365,7 @@ notify(void *baton, const svn_wc_notify_
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -386,7 +386,7 @@ notify(void *baton, const svn_wc_notify_
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT" (%s)\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -400,7 +400,7 @@ notify(void *baton, const svn_wc_notify_
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT"\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
Modified: subversion/branches/fsfs-improvements/tools/dev/fsfs-reorg.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/tools/dev/fsfs-reorg.c?rev=1536949&r1=1536948&r2=1536949&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/tools/dev/fsfs-reorg.c (original)
+++ subversion/branches/fsfs-improvements/tools/dev/fsfs-reorg.c Wed Oct 30 01:04:22 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/fsfs-improvements/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/tools/dev/unix-build/Makefile.svn?rev=1536949&r1=1536948&r2=1536949&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/fsfs-improvements/tools/dev/unix-build/Makefile.svn Wed Oct 30 01:04:22 2013
@@ -72,7 +72,7 @@ GNU_ICONV_VER = 1.14
APR_UTIL_VER = 1.4.1
HTTPD_VER = 2.2.25
NEON_VER = 0.29.6
-SERF_VER = 1.3.1
+SERF_VER = 1.3.2
SERF_OLD_VER = 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3071600
@@ -744,6 +744,9 @@ $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR
rm -rf $(PREFIX)/serf # XXX scons cannot reinstall :(
cd $(SERF_SRCDIR) && \
scons install
+ # work around unportable scons shared lib support
+ -ln -s libserf-1.so.$(shell echo $(SERF_VER) | sed -e 's/[0-9]$$/0/') \
+ $(PREFIX)/serf/lib/libserf-1.so
touch $@
#######################################################################
Modified: subversion/branches/fsfs-improvements/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/tools/server-side/fsfs-stats.c?rev=1536949&r1=1536948&r2=1536949&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/fsfs-improvements/tools/server-side/fsfs-stats.c Wed Oct 30 01:04:22 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/fsfs-improvements/tools/server-side/svn-populate-node-origins-index.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/tools/server-side/svn-populate-node-origins-index.c?rev=1536949&r1=1536948&r2=1536949&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/tools/server-side/svn-populate-node-origins-index.c (original)
+++ subversion/branches/fsfs-improvements/tools/server-side/svn-populate-node-origins-index.c Wed Oct 30 01:04:22 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/fsfs-improvements/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/tools/server-side/svn-rep-sharing-stats.c?rev=1536949&r1=1536948&r2=1536949&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/fsfs-improvements/tools/server-side/svn-rep-sharing-stats.c Wed Oct 30 01:04:22 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? */