You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/02/10 03:12:37 UTC
svn commit: r1242638 - /subversion/trunk/subversion/svnrdump/dump_editor.c
Author: hwright
Date: Fri Feb 10 02:12:36 2012
New Revision: 1242638
URL: http://svn.apache.org/viewvc?rev=1242638&view=rev
Log:
* subversion/svnrdump/dump_editor.c
(get_props_content): Drop a superfluous stream.
Modified:
subversion/trunk/subversion/svnrdump/dump_editor.c
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1242638&r1=1242637&r2=1242638&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Fri Feb 10 02:12:36 2012
@@ -179,14 +179,13 @@ get_props_content(svn_stringbuf_t **head
apr_pool_t *scratch_pool)
{
svn_stream_t *content_stream;
- svn_stream_t *header_stream;
apr_hash_t *normal_props;
+ const char *buf;
*content = svn_stringbuf_create_empty(result_pool);
*header = svn_stringbuf_create_empty(result_pool);
content_stream = svn_stream_from_stringbuf(*content, scratch_pool);
- header_stream = svn_stream_from_stringbuf(*header, scratch_pool);
SVN_ERR(svn_rdump__normalize_props(&normal_props, props, scratch_pool));
SVN_ERR(svn_hash_write_incremental(normal_props, deleted_props,
@@ -195,16 +194,13 @@ get_props_content(svn_stringbuf_t **head
SVN_ERR(svn_stream_close(content_stream));
/* Prop-delta: true */
- SVN_ERR(svn_stream_printf(header_stream, scratch_pool,
- SVN_REPOS_DUMPFILE_PROP_DELTA
- ": true\n"));
+ *header = svn_stringbuf_createf(result_pool, SVN_REPOS_DUMPFILE_PROP_DELTA
+ ": true\n");
/* Prop-content-length: 193 */
- SVN_ERR(svn_stream_printf(header_stream, scratch_pool,
- SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH
- ": %" APR_SIZE_T_FMT "\n", (*content)->len));
-
- SVN_ERR(svn_stream_close(header_stream));
+ buf = apr_psprintf(scratch_pool, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH
+ ": %" APR_SIZE_T_FMT "\n", (*content)->len);
+ svn_stringbuf_appendcstr(*header, buf);
return SVN_NO_ERROR;
}