Redo 1190597 with the right replacement. * subversion/libsvn_client/patch.c, subversion/libsvn_delta/compose_delta.c, subversion/libsvn_delta/text_delta.c, subversion/libsvn_diff/diff_file.c, subversion/libsvn_diff/diff_memory.c, subversion/libsvn_diff/parse-diff.c, subversion/libsvn_fs_base/tree.c, subversion/libsvn_fs_fs/lock.c, subversion/libsvn_fs_fs/tree.c, subversion/libsvn_ra/ra_loader.c, subversion/libsvn_ra_neon/fetch.c, subversion/libsvn_ra_neon/file_revs.c, subversion/libsvn_ra_neon/get_dated_rev.c, subversion/libsvn_ra_neon/get_deleted_rev.c, subversion/libsvn_ra_neon/get_location_segments.c, subversion/libsvn_ra_neon/get_locations.c, subversion/libsvn_ra_neon/get_locks.c, subversion/libsvn_ra_neon/lock.c, subversion/libsvn_ra_neon/log.c, subversion/libsvn_ra_neon/merge.c, subversion/libsvn_ra_neon/mergeinfo.c, subversion/libsvn_ra_neon/options.c, subversion/libsvn_ra_neon/props.c, subversion/libsvn_ra_neon/replay.c, subversion/libsvn_ra_neon/util.c, subversion/libsvn_ra_serf/mergeinfo.c, subversion/libsvn_ra_serf/util.c, subversion/libsvn_subr/cmdline.c, subversion/libsvn_subr/config.c, subversion/libsvn_subr/config_file.c, subversion/libsvn_subr/config_win.c, subversion/libsvn_subr/log.c, subversion/libsvn_subr/mergeinfo.c, subversion/libsvn_subr/prompt.c, subversion/libsvn_subr/quoprint.c, subversion/libsvn_subr/subst.c, subversion/libsvn_subr/svn_base64.c, subversion/libsvn_subr/svn_string.c, subversion/libsvn_subr/win32_xlate.c, subversion/libsvn_subr/xml.c, subversion/mod_dav_svn/util.c, subversion/svn/blame-cmd.c, subversion/svn/diff-cmd.c, subversion/svn/info-cmd.c, subversion/svn/list-cmd.c, subversion/svn/log-cmd.c, subversion/svn/props.c, subversion/svn/status-cmd.c, subversion/svn/status.c, subversion/svn/util.c, subversion/svndumpfilter/main.c, subversion/svnlook/main.c, subversion/svnrdump/dump_editor.c, subversion/svnrdump/svnrdump.c, subversion/svnserve/serve.c, subversion/svnsync/sync.c, subversion/tests/libsvn_diff/diff-diff3-test.c, subversion/tests/libsvn_fs_base/strings-reps-test.c, subversion/tests/libsvn_subr/path-test.c, subversion/tests/libsvn_subr/stream-test.c, subversion/tests/libsvn_subr/string-test.c, subversion/tests/svn_test_fs.c: call the proper stringbuf API - not the string API git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/integrate-string-improvements@1190605 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_client/patch.c b/subversion/libsvn_client/patch.c index 48b96b5..d58df08 100644 --- a/subversion/libsvn_client/patch.c +++ b/subversion/libsvn_client/patch.c
@@ -670,7 +670,7 @@ } content->existed = (value != NULL); new_prop_target->value = value; - new_prop_target->patched_value = svn_string_create_empty(result_pool); + new_prop_target->patched_value = svn_stringbuf_create_empty(result_pool); /* Wire up the read and write callbacks. */
diff --git a/subversion/libsvn_delta/compose_delta.c b/subversion/libsvn_delta/compose_delta.c index 8fa70d9..7b96438 100644 --- a/subversion/libsvn_delta/compose_delta.c +++ b/subversion/libsvn_delta/compose_delta.c
@@ -774,7 +774,7 @@ /* Read the description of the delta composition algorithm in notes/fs-improvements.txt before going any further. You have been warned. */ - build_baton.new_data = svn_string_create_empty(pool); + build_baton.new_data = svn_stringbuf_create_empty(pool); for (i = 0; i < window_B->num_ops; ++i) { const svn_txdelta_op_t *const op = &window_B->ops[i];
diff --git a/subversion/libsvn_delta/text_delta.c b/subversion/libsvn_delta/text_delta.c index 9171923..b8e9d40 100644 --- a/subversion/libsvn_delta/text_delta.c +++ b/subversion/libsvn_delta/text_delta.c
@@ -150,7 +150,7 @@ svn_txdelta_window_t *window; /* Compute the delta operations. */ - build_baton.new_data = svn_string_create_empty(pool); + build_baton.new_data = svn_stringbuf_create_empty(pool); if (source_len == 0) svn_txdelta__insert_op(&build_baton, svn_txdelta_new, 0, target_len, data,
diff --git a/subversion/libsvn_diff/diff_file.c b/subversion/libsvn_diff/diff_file.c index 81d5b55..e078b6a 100644 --- a/subversion/libsvn_diff/diff_file.c +++ b/subversion/libsvn_diff/diff_file.c
@@ -1755,9 +1755,9 @@ baton.header_encoding = header_encoding; baton.path[0] = original_path; baton.path[1] = modified_path; - baton.hunk = svn_string_create_empty(pool); + baton.hunk = svn_stringbuf_create_empty(pool); baton.show_c_function = show_c_function; - baton.extra_context = svn_string_create_empty(pool); + baton.extra_context = svn_stringbuf_create_empty(pool); baton.extra_skip_match = apr_array_make(pool, 3, sizeof(char **)); c = apr_array_push(baton.extra_skip_match);
diff --git a/subversion/libsvn_diff/diff_memory.c b/subversion/libsvn_diff/diff_memory.c index d5ca3bd..960b5ac 100644 --- a/subversion/libsvn_diff/diff_memory.c +++ b/subversion/libsvn_diff/diff_memory.c
@@ -584,7 +584,7 @@ baton.output_stream = output_stream; baton.pool = svn_pool_create(pool); baton.header_encoding = header_encoding; - baton.hunk = svn_string_create_empty(pool); + baton.hunk = svn_stringbuf_create_empty(pool); baton.hunk_delimiter = hunk_delimiter; SVN_ERR(svn_utf_cstring_from_utf8_ex2
diff --git a/subversion/libsvn_diff/parse-diff.c b/subversion/libsvn_diff/parse-diff.c index 66e7629..e8a9654 100644 --- a/subversion/libsvn_diff/parse-diff.c +++ b/subversion/libsvn_diff/parse-diff.c
@@ -396,7 +396,7 @@ *eof = TRUE; if (eol) *eol = NULL; - *stringbuf = svn_string_create_empty(result_pool); + *stringbuf = svn_stringbuf_create_empty(result_pool); return SVN_NO_ERROR; } @@ -490,7 +490,7 @@ *eof = TRUE; if (eol) *eol = NULL; - *stringbuf = svn_string_create_empty(result_pool); + *stringbuf = svn_stringbuf_create_empty(result_pool); return SVN_NO_ERROR; }
diff --git a/subversion/libsvn_fs_base/tree.c b/subversion/libsvn_fs_base/tree.c index 943a192..1713448 100644 --- a/subversion/libsvn_fs_base/tree.c +++ b/subversion/libsvn_fs_base/tree.c
@@ -2722,7 +2722,7 @@ merge_args.ancestor_node = NULL; merge_args.source_node = youngish_root_node; merge_args.txn = txn; - merge_args.conflict = svn_string_create_empty(pool); /* use pool */ + merge_args.conflict = svn_stringbuf_create_empty(pool); /* use pool */ err = svn_fs_base__retry_txn(fs, txn_body_merge, &merge_args, FALSE, subpool); if (err) @@ -2832,7 +2832,7 @@ merge_args.source_node = source; merge_args.ancestor_node = ancestor; merge_args.txn = txn; - merge_args.conflict = svn_string_create_empty(pool); + merge_args.conflict = svn_stringbuf_create_empty(pool); err = svn_fs_base__retry_txn(fs, txn_body_merge, &merge_args, FALSE, pool); if (err) { @@ -3762,7 +3762,7 @@ /* Make a writable "string" stream which writes data to tb->target_string. */ - tb->target_string = svn_string_create_empty(tb->pool); + tb->target_string = svn_stringbuf_create_empty(tb->pool); tb->string_stream = svn_stream_create(tb, tb->pool); svn_stream_set_write(tb->string_stream, write_to_string);
diff --git a/subversion/libsvn_fs_fs/lock.c b/subversion/libsvn_fs_fs/lock.c index 9abd25b..cae15d2 100644 --- a/subversion/libsvn_fs_fs/lock.c +++ b/subversion/libsvn_fs_fs/lock.c
@@ -205,7 +205,7 @@ } if (apr_hash_count(children)) { - svn_stringbuf_t *children_list = svn_string_create_empty(pool); + svn_stringbuf_t *children_list = svn_stringbuf_create_empty(pool); for (hi = apr_hash_first(pool, children); hi; hi = apr_hash_next(hi)) { svn_stringbuf_appendbytes(children_list,
diff --git a/subversion/libsvn_fs_fs/tree.c b/subversion/libsvn_fs_fs/tree.c index 804c89b..8a9195f 100644 --- a/subversion/libsvn_fs_fs/tree.c +++ b/subversion/libsvn_fs_fs/tree.c
@@ -1648,7 +1648,7 @@ */ svn_error_t *err = SVN_NO_ERROR; - svn_stringbuf_t *conflict = svn_string_create_empty(pool); + svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); svn_fs_t *fs = txn->fs; /* Limit memory usage when the repository has a high commit rate and @@ -1756,7 +1756,7 @@ dag_node_t *source, *ancestor; svn_fs_txn_t *txn; svn_error_t *err; - svn_stringbuf_t *conflict = svn_string_create_empty(pool); + svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); if (! target_root->is_txn_root) return SVN_FS__NOT_TXN(target_root); @@ -2455,7 +2455,7 @@ /* Make a writable "string" stream which writes data to tb->target_string. */ - tb->target_string = svn_string_create_empty(tb->pool); + tb->target_string = svn_stringbuf_create_empty(tb->pool); tb->string_stream = svn_stream_create(tb, tb->pool); svn_stream_set_write(tb->string_stream, write_to_string);
diff --git a/subversion/libsvn_ra/ra_loader.c b/subversion/libsvn_ra/ra_loader.c index 609cb60..0166c82 100644 --- a/subversion/libsvn_ra/ra_loader.c +++ b/subversion/libsvn_ra/ra_loader.c
@@ -1285,7 +1285,7 @@ void *ra_baton, apr_pool_t *pool) { - *descriptions = svn_string_create_empty(pool); + *descriptions = svn_stringbuf_create_empty(pool); return svn_ra_print_modules(*descriptions, pool); }
diff --git a/subversion/libsvn_ra_neon/fetch.c b/subversion/libsvn_ra_neon/fetch.c index b4c6ac7..9eac477 100644 --- a/subversion/libsvn_ra_neon/fetch.c +++ b/subversion/libsvn_ra_neon/fetch.c
@@ -1487,7 +1487,7 @@ if (DIR_DEPTH(rb) == 0) { /* pathbuf has to live for the whole edit! */ - pathbuf = svn_string_create_empty(rb->pool); + pathbuf = svn_stringbuf_create_empty(rb->pool); /* During switch operations, we need to invalidate the tree's version resource URLs in case something goes @@ -2544,7 +2544,7 @@ rb->edit_baton = edit_baton; rb->fetch_content = fetch_content; rb->in_resource = FALSE; - rb->current_wcprop_path = svn_string_create_empty(pool); + rb->current_wcprop_path = svn_stringbuf_create_empty(pool); rb->is_switch = dst_path != NULL; rb->target = target; rb->receiving_all = FALSE; @@ -2553,7 +2553,7 @@ rb->whandler_baton = NULL; rb->svndiff_decoder = NULL; rb->base64_decoder = NULL; - rb->cdata_accum = svn_string_create_empty(pool); + rb->cdata_accum = svn_stringbuf_create_empty(pool); rb->send_copyfrom_args = send_copyfrom_args; rb->lock_tokens = apr_hash_make(pool);
diff --git a/subversion/libsvn_ra_neon/file_revs.c b/subversion/libsvn_ra_neon/file_revs.c index 2ceaf17..fbe623f 100644 --- a/subversion/libsvn_ra_neon/file_revs.c +++ b/subversion/libsvn_ra_neon/file_revs.c
@@ -307,7 +307,7 @@ apr_pool_t *pool) { svn_ra_neon__session_t *ras = session->priv; - svn_stringbuf_t *request_body = svn_string_create_empty(pool); + svn_stringbuf_t *request_body = svn_stringbuf_create_empty(pool); const char *bc_url; const char *bc_relative; const char *final_bc_url; @@ -349,7 +349,7 @@ /* Initialize the baton. */ rb.handler = handler; rb.handler_baton = handler_baton; - rb.cdata_accum = svn_string_create_empty(pool); + rb.cdata_accum = svn_stringbuf_create_empty(pool); rb.subpool = svn_pool_create(pool); reset_file_rev(&rb);
diff --git a/subversion/libsvn_ra_neon/get_dated_rev.c b/subversion/libsvn_ra_neon/get_dated_rev.c index 5eb8e44..0f3882c 100644 --- a/subversion/libsvn_ra_neon/get_dated_rev.c +++ b/subversion/libsvn_ra_neon/get_dated_rev.c
@@ -93,7 +93,7 @@ return SVN_NO_ERROR; if (elm->id == ELEM_version_name) - b->cdata = svn_string_create_empty(b->pool); + b->cdata = svn_stringbuf_create_empty(b->pool); return SVN_NO_ERROR; }
diff --git a/subversion/libsvn_ra_neon/get_deleted_rev.c b/subversion/libsvn_ra_neon/get_deleted_rev.c index 6c5bec9..a7682aa 100644 --- a/subversion/libsvn_ra_neon/get_deleted_rev.c +++ b/subversion/libsvn_ra_neon/get_deleted_rev.c
@@ -89,7 +89,7 @@ return SVN_NO_ERROR; if (elm->id == ELEM_version_name) - b->cdata = svn_string_create_empty(b->pool); + b->cdata = svn_stringbuf_create_empty(b->pool); return SVN_NO_ERROR; }
diff --git a/subversion/libsvn_ra_neon/get_location_segments.c b/subversion/libsvn_ra_neon/get_location_segments.c index 0c0811f..9be8ba5 100644 --- a/subversion/libsvn_ra_neon/get_location_segments.c +++ b/subversion/libsvn_ra_neon/get_location_segments.c
@@ -150,7 +150,7 @@ apr_pool_t *subpool = svn_pool_create(pool); /* Build the request body. */ - request_body = svn_string_create_empty(subpool); + request_body = svn_stringbuf_create_empty(subpool); svn_stringbuf_appendcstr(request_body, "<?xml version=\"1.0\" encoding=\"utf-8\"?>" DEBUG_CR "<S:get-location-segments xmlns:S=\""
diff --git a/subversion/libsvn_ra_neon/get_locations.c b/subversion/libsvn_ra_neon/get_locations.c index 92d2fc6..a7e8464 100644 --- a/subversion/libsvn_ra_neon/get_locations.c +++ b/subversion/libsvn_ra_neon/get_locations.c
@@ -138,7 +138,7 @@ *locations = apr_hash_make(pool); - request_body = svn_string_create_empty(pool); + request_body = svn_stringbuf_create_empty(pool); svn_stringbuf_appendcstr(request_body, "<?xml version=\"1.0\" encoding=\"utf-8\"?>" DEBUG_CR "<S:get-locations xmlns:S=\"" SVN_XML_NAMESPACE
diff --git a/subversion/libsvn_ra_neon/get_locks.c b/subversion/libsvn_ra_neon/get_locks.c index 37e3c1c..26bc233 100644 --- a/subversion/libsvn_ra_neon/get_locks.c +++ b/subversion/libsvn_ra_neon/get_locks.c
@@ -389,7 +389,7 @@ baton.scratchpool = svn_pool_create(pool); baton.current_lock = NULL; baton.encoding = NULL; - baton.cdata_accum = svn_string_create_empty(pool); + baton.cdata_accum = svn_stringbuf_create_empty(pool); body = apr_psprintf(pool, "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
diff --git a/subversion/libsvn_ra_neon/lock.c b/subversion/libsvn_ra_neon/lock.c index 33a2271..e5d86e8 100644 --- a/subversion/libsvn_ra_neon/lock.c +++ b/subversion/libsvn_ra_neon/lock.c
@@ -105,13 +105,13 @@ case ELEM_lock_timeout: case ELEM_lock_depth: case ELEM_status: - b->cdata = svn_string_create_empty(b->pool); + b->cdata = svn_stringbuf_create_empty(b->pool); break; case ELEM_href: if (parent == ELEM_lock_token || parent == ELEM_response) - b->cdata = svn_string_create_empty(b->pool); + b->cdata = svn_stringbuf_create_empty(b->pool); break; default:
diff --git a/subversion/libsvn_ra_neon/log.c b/subversion/libsvn_ra_neon/log.c index a739f16..1b7f896 100644 --- a/subversion/libsvn_ra_neon/log.c +++ b/subversion/libsvn_ra_neon/log.c
@@ -365,7 +365,7 @@ int i; svn_ra_neon__session_t *ras = session->priv; - svn_stringbuf_t *request_body = svn_string_create_empty(pool); + svn_stringbuf_t *request_body = svn_stringbuf_create_empty(pool); svn_boolean_t want_custom_revprops; struct log_baton lb; const char *bc_url; @@ -491,7 +491,7 @@ lb.count = 0; lb.nest_level = 0; lb.limit_compat_bailout = FALSE; - lb.cdata = svn_string_create_empty(pool); + lb.cdata = svn_stringbuf_create_empty(pool); lb.log_entry = svn_log_entry_create(pool); lb.want_cdata = NULL; reset_log_item(&lb);
diff --git a/subversion/libsvn_ra_neon/merge.c b/subversion/libsvn_ra_neon/merge.c index 980038d..eb97b92 100644 --- a/subversion/libsvn_ra_neon/merge.c +++ b/subversion/libsvn_ra_neon/merge.c
@@ -704,9 +704,9 @@ merge_ctx_t mc = { 0 }; const char *body; apr_hash_t *extra_headers = NULL; - svn_stringbuf_t *lockbuf = svn_string_create_empty(pool); + svn_stringbuf_t *lockbuf = svn_stringbuf_create_empty(pool); - mc.cdata = svn_string_create_empty(pool); + mc.cdata = svn_stringbuf_create_empty(pool); mc.pool = pool; mc.scratchpool = svn_pool_create(pool); mc.base_href = repos_url;
diff --git a/subversion/libsvn_ra_neon/mergeinfo.c b/subversion/libsvn_ra_neon/mergeinfo.c index b532caa..30e7800 100644 --- a/subversion/libsvn_ra_neon/mergeinfo.c +++ b/subversion/libsvn_ra_neon/mergeinfo.c
@@ -167,7 +167,7 @@ apr_pool_t *pool) { svn_ra_neon__session_t *ras = session->priv; - svn_stringbuf_t *request_body = svn_string_create_empty(pool); + svn_stringbuf_t *request_body = svn_stringbuf_create_empty(pool); struct mergeinfo_baton mb; const char *bc_url; const char *bc_relative; @@ -221,8 +221,8 @@ svn_stringbuf_appendcstr(request_body, minfo_report_tail); mb.pool = pool; - mb.curr_path = svn_string_create_empty(pool); - mb.curr_info = svn_string_create_empty(pool); + mb.curr_path = svn_stringbuf_create_empty(pool); + mb.curr_info = svn_stringbuf_create_empty(pool); mb.catalog = apr_hash_make(pool); mb.err = SVN_NO_ERROR;
diff --git a/subversion/libsvn_ra_neon/options.c b/subversion/libsvn_ra_neon/options.c index 7161616..eb43ed1 100644 --- a/subversion/libsvn_ra_neon/options.c +++ b/subversion/libsvn_ra_neon/options.c
@@ -288,7 +288,7 @@ int status_code; oc.pool = pool; - oc.cdata = svn_string_create_empty(pool); + oc.cdata = svn_stringbuf_create_empty(pool); if (youngest_rev) *youngest_rev = SVN_INVALID_REVNUM;
diff --git a/subversion/libsvn_ra_neon/props.c b/subversion/libsvn_ra_neon/props.c index 000ed90..d18d002 100644 --- a/subversion/libsvn_ra_neon/props.c +++ b/subversion/libsvn_ra_neon/props.c
@@ -547,7 +547,7 @@ pc.pool = pool; pc.propbuffer = apr_hash_make(pool); pc.props = apr_hash_make(pool); - pc.cdata = svn_string_create_empty(pool); + pc.cdata = svn_stringbuf_create_empty(pool); /* Create and dispatch the request! */ SVN_ERR(svn_ra_neon__parsed_request(sess, "PROPFIND", url,
diff --git a/subversion/libsvn_ra_neon/replay.c b/subversion/libsvn_ra_neon/replay.c index 0380abf..aa9d13a 100644 --- a/subversion/libsvn_ra_neon/replay.c +++ b/subversion/libsvn_ra_neon/replay.c
@@ -345,7 +345,7 @@ if (svn_xml_get_attr_value("del", atts)) rb->prop_accum = NULL; else - rb->prop_accum = svn_string_create_empty(rb->prop_pool); + rb->prop_accum = svn_stringbuf_create_empty(rb->prop_pool); rb->prop_name = apr_pstrdup(rb->prop_pool, name); } @@ -479,7 +479,7 @@ rb.pool = pool; rb.dirs = apr_array_make(pool, 5, sizeof(dir_item_t)); rb.prop_pool = svn_pool_create(pool); - rb.prop_accum = svn_string_create_empty(rb.prop_pool); + rb.prop_accum = svn_stringbuf_create_empty(rb.prop_pool); return svn_ra_neon__parsed_request(ras, "REPORT", ras->url->data, body, NULL, NULL,
diff --git a/subversion/libsvn_ra_neon/util.c b/subversion/libsvn_ra_neon/util.c index 9f85bed..f1bbaf3 100644 --- a/subversion/libsvn_ra_neon/util.c +++ b/subversion/libsvn_ra_neon/util.c
@@ -313,12 +313,12 @@ start_207_element, svn_ra_neon__xml_collect_cdata, end_207_element, b); - b->cdata = svn_string_create_empty(req->pool); - b->description = svn_string_create_empty(req->pool); + b->cdata = svn_stringbuf_create_empty(req->pool); + b->description = svn_stringbuf_create_empty(req->pool); b->req = req; - b->propname = svn_string_create_empty(req->pool); - b->propstat_description = svn_string_create_empty(req->pool); + b->propname = svn_stringbuf_create_empty(req->pool); + b->propstat_description = svn_stringbuf_create_empty(req->pool); } @@ -895,7 +895,7 @@ b->tmp_err = NULL; b->want_cdata = NULL; - b->cdata = svn_string_create_empty(req->pool); + b->cdata = svn_stringbuf_create_empty(req->pool); /* attach a standard <D:error> body parser to the request */ error_parser = xml_parser_create(req);
diff --git a/subversion/libsvn_ra_serf/mergeinfo.c b/subversion/libsvn_ra_serf/mergeinfo.c index 78ba3b4..e0b8bec 100644 --- a/subversion/libsvn_ra_serf/mergeinfo.c +++ b/subversion/libsvn_ra_serf/mergeinfo.c
@@ -256,8 +256,8 @@ mergeinfo_ctx = apr_pcalloc(pool, sizeof(*mergeinfo_ctx)); mergeinfo_ctx->pool = pool; - mergeinfo_ctx->curr_path = svn_string_create_empty(pool); - mergeinfo_ctx->curr_info = svn_string_create_empty(pool); + mergeinfo_ctx->curr_path = svn_stringbuf_create_empty(pool); + mergeinfo_ctx->curr_info = svn_stringbuf_create_empty(pool); mergeinfo_ctx->done = FALSE; mergeinfo_ctx->result_catalog = apr_hash_make(pool); mergeinfo_ctx->paths = paths;
diff --git a/subversion/libsvn_ra_serf/util.c b/subversion/libsvn_ra_serf/util.c index 4d90a6c..51ab5a2 100644 --- a/subversion/libsvn_ra_serf/util.c +++ b/subversion/libsvn_ra_serf/util.c
@@ -914,7 +914,7 @@ server_err->error = svn_error_create(APR_SUCCESS, NULL, NULL); server_err->has_xml_response = TRUE; server_err->contains_precondition_error = FALSE; - server_err->cdata = svn_string_create_empty(pool); + server_err->cdata = svn_stringbuf_create_empty(pool); server_err->collect_cdata = FALSE; server_err->parser.pool = server_err->error->pool; server_err->parser.user_data = server_err; @@ -1182,7 +1182,7 @@ server_err->error = svn_error_create(APR_SUCCESS, NULL, NULL); server_err->has_xml_response = TRUE; server_err->contains_precondition_error = FALSE; - server_err->cdata = svn_string_create_empty(server_err->error->pool); + server_err->cdata = svn_stringbuf_create_empty(server_err->error->pool); server_err->collect_cdata = FALSE; server_err->parser.pool = server_err->error->pool; server_err->parser.user_data = server_err;
diff --git a/subversion/libsvn_subr/cmdline.c b/subversion/libsvn_subr/cmdline.c index 75e6721..5a1dd9d 100644 --- a/subversion/libsvn_subr/cmdline.c +++ b/subversion/libsvn_subr/cmdline.c
@@ -637,7 +637,7 @@ const char *encoding = NULL; if (*outstr == NULL) - *outstr = svn_string_create_empty(pool); + *outstr = svn_stringbuf_create_empty(pool); if (svn_xml_is_xml_safe(propval->data, propval->len)) {
diff --git a/subversion/libsvn_subr/config.c b/subversion/libsvn_subr/config.c index 22acad3..f713946 100644 --- a/subversion/libsvn_subr/config.c +++ b/subversion/libsvn_subr/config.c
@@ -88,8 +88,8 @@ cfg->pool = result_pool; cfg->x_pool = svn_pool_create(result_pool); cfg->x_values = FALSE; - cfg->tmp_key = svn_string_create_empty(result_pool); - cfg->tmp_value = svn_string_create_empty(result_pool); + cfg->tmp_key = svn_stringbuf_create_empty(result_pool); + cfg->tmp_value = svn_stringbuf_create_empty(result_pool); cfg->section_names_case_sensitive = section_names_case_sensitive; *cfgp = cfg;
diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c index e00430c..04cb758 100644 --- a/subversion/libsvn_subr/config_file.c +++ b/subversion/libsvn_subr/config_file.c
@@ -386,9 +386,9 @@ pool); ctx.line = 1; ctx.have_ungotten_char = FALSE; - ctx.section = svn_string_create_empty(pool); - ctx.option = svn_string_create_empty(pool); - ctx.value = svn_string_create_empty(pool); + ctx.section = svn_stringbuf_create_empty(pool); + ctx.option = svn_stringbuf_create_empty(pool); + ctx.value = svn_stringbuf_create_empty(pool); do {
diff --git a/subversion/libsvn_subr/config_win.c b/subversion/libsvn_subr/config_win.c index 5086b3e..f610473 100644 --- a/subversion/libsvn_subr/config_win.c +++ b/subversion/libsvn_subr/config_win.c
@@ -200,9 +200,9 @@ subpool = svn_pool_create(pool); - section = svn_string_create_empty(subpool); - option = svn_string_create_empty(subpool); - value = svn_string_create_empty(subpool); + section = svn_stringbuf_create_empty(subpool); + option = svn_stringbuf_create_empty(subpool); + value = svn_stringbuf_create_empty(subpool); /* The top-level values belong to the [DEFAULT] section */ svn_err = parse_section(cfg, hkey, SVN_CONFIG__DEFAULT_SECTION,
diff --git a/subversion/libsvn_subr/log.c b/subversion/libsvn_subr/log.c index b08ed09..8f4a058 100644 --- a/subversion/libsvn_subr/log.c +++ b/subversion/libsvn_subr/log.c
@@ -121,7 +121,7 @@ { int i; apr_pool_t *iterpool = svn_pool_create(pool); - svn_stringbuf_t *space_separated_paths = svn_string_create_empty(pool); + svn_stringbuf_t *space_separated_paths = svn_stringbuf_create_empty(pool); for (i = 0; i < paths->nelts; i++) { @@ -210,8 +210,8 @@ { int i; apr_pool_t *iterpool = svn_pool_create(pool); - svn_stringbuf_t *space_separated_paths = svn_string_create_empty(pool); - svn_stringbuf_t *options = svn_string_create_empty(pool); + svn_stringbuf_t *space_separated_paths = svn_stringbuf_create_empty(pool); + svn_stringbuf_t *options = svn_stringbuf_create_empty(pool); for (i = 0; i < paths->nelts; i++) { @@ -264,7 +264,7 @@ { const svn_revnum_t *revision_ptr, *revision_ptr_start, *revision_ptr_end; apr_pool_t *iterpool = svn_pool_create(pool); - svn_stringbuf_t *space_separated_revnums = svn_string_create_empty(pool); + svn_stringbuf_t *space_separated_revnums = svn_stringbuf_create_empty(pool); revision_ptr_start = (const svn_revnum_t *)location_revisions->elts; revision_ptr = revision_ptr_start; @@ -311,7 +311,7 @@ { int i; apr_pool_t *iterpool = svn_pool_create(pool); - svn_stringbuf_t *space_separated_paths = svn_string_create_empty(pool); + svn_stringbuf_t *space_separated_paths = svn_stringbuf_create_empty(pool); for (i = 0; i < paths->nelts; i++) { @@ -334,7 +334,7 @@ { int i; apr_pool_t *iterpool = svn_pool_create(pool); - svn_stringbuf_t *space_separated_paths = svn_string_create_empty(pool); + svn_stringbuf_t *space_separated_paths = svn_stringbuf_create_empty(pool); for (i = 0; i < paths->nelts; i++) {
diff --git a/subversion/libsvn_subr/mergeinfo.c b/subversion/libsvn_subr/mergeinfo.c index 4d97dc1..2c68bbf 100644 --- a/subversion/libsvn_subr/mergeinfo.c +++ b/subversion/libsvn_subr/mergeinfo.c
@@ -1842,7 +1842,7 @@ const apr_array_header_t *rangelist, apr_pool_t *pool) { - svn_stringbuf_t *buf = svn_string_create_empty(pool); + svn_stringbuf_t *buf = svn_stringbuf_create_empty(pool); if (rangelist->nelts > 0) { @@ -1879,7 +1879,7 @@ const char *prefix, apr_pool_t *pool) { - *output = svn_string_create_empty(pool); + *output = svn_stringbuf_create_empty(pool); if (apr_hash_count(input) > 0) { @@ -2248,7 +2248,7 @@ apr_array_header_t *sorted_catalog = svn_sort__hash(catalog, svn_sort_compare_items_as_paths, pool); - output_buf = svn_string_create_empty(pool); + output_buf = svn_stringbuf_create_empty(pool); for (i = 0; i < sorted_catalog->nelts; i++) { svn_sort__item_t elt =
diff --git a/subversion/libsvn_subr/prompt.c b/subversion/libsvn_subr/prompt.c index cd259b6..7beefec 100644 --- a/subversion/libsvn_subr/prompt.c +++ b/subversion/libsvn_subr/prompt.c
@@ -95,7 +95,7 @@ apr_file_t *fp; char c; - svn_stringbuf_t *strbuf = svn_string_create_empty(pool); + svn_stringbuf_t *strbuf = svn_stringbuf_create_empty(pool); status = apr_file_open_stdin(&fp, pool); if (status)
diff --git a/subversion/libsvn_subr/quoprint.c b/subversion/libsvn_subr/quoprint.c index b9ad764..6e92caa 100644 --- a/subversion/libsvn_subr/quoprint.c +++ b/subversion/libsvn_subr/quoprint.c
@@ -120,7 +120,7 @@ { struct encode_baton *eb = baton; apr_pool_t *subpool = svn_pool_create(eb->pool); - svn_stringbuf_t *encoded = svn_string_create_empty(subpool); + svn_stringbuf_t *encoded = svn_stringbuf_create_empty(subpool); apr_size_t enclen; svn_error_t *err = SVN_NO_ERROR; @@ -177,7 +177,7 @@ svn_stringbuf_t * svn_quoprint_encode_string(const svn_stringbuf_t *str, apr_pool_t *pool) { - svn_stringbuf_t *encoded = svn_string_create_empty(pool); + svn_stringbuf_t *encoded = svn_stringbuf_create_empty(pool); int linelen = 0; encode_bytes(encoded, str->data, str->len, &linelen); @@ -254,7 +254,7 @@ /* Decode this block of data. */ subpool = svn_pool_create(db->pool); - decoded = svn_string_create_empty(subpool); + decoded = svn_stringbuf_create_empty(subpool); decode_bytes(decoded, data, *len, db->buf, &db->buflen); /* Write the output, clean up, go home. */ @@ -300,7 +300,7 @@ svn_stringbuf_t * svn_quoprint_decode_string(const svn_stringbuf_t *str, apr_pool_t *pool) { - svn_stringbuf_t *decoded = svn_string_create_empty(pool); + svn_stringbuf_t *decoded = svn_stringbuf_create_empty(pool); char ingroup[4]; int ingrouplen = 0;
diff --git a/subversion/libsvn_subr/subst.c b/subversion/libsvn_subr/subst.c index a514a56..5620435 100644 --- a/subversion/libsvn_subr/subst.c +++ b/subversion/libsvn_subr/subst.c
@@ -1467,7 +1467,7 @@ = create_translation_baton(eol_str, translated_eol, repair, keywords, expand, result_pool); baton->written = FALSE; - baton->readbuf = svn_string_create_empty(result_pool); + baton->readbuf = svn_stringbuf_create_empty(result_pool); baton->readbuf_off = 0; baton->iterpool = svn_pool_create(result_pool); baton->buf = apr_palloc(result_pool, SVN__TRANSLATION_BUF_SIZE); @@ -1522,7 +1522,7 @@ } /* Create a stringbuf and wrapper stream to hold the output. */ - dst_stringbuf = svn_string_create_empty(pool); + dst_stringbuf = svn_stringbuf_create_empty(pool); dst_stream = svn_stream_from_stringbuf(dst_stringbuf, pool); if (translated_eol) @@ -1813,7 +1813,7 @@ /* SCRATCH_POOL may not exist after the function returns. */ baton->pool = result_pool; - baton->write_content = svn_string_create_empty(result_pool); + baton->write_content = svn_stringbuf_create_empty(result_pool); baton->write_stream = svn_stream_from_stringbuf(baton->write_content, result_pool); @@ -1852,7 +1852,7 @@ baton->read_stream = NULL; } - baton->write_content = svn_string_create_empty(pool); + baton->write_content = svn_stringbuf_create_empty(pool); baton->write_stream = svn_stream_from_stringbuf(baton->write_content, pool); *stream = svn_stream_create(baton, pool);
diff --git a/subversion/libsvn_subr/svn_base64.c b/subversion/libsvn_subr/svn_base64.c index c94fda0..277930a 100644 --- a/subversion/libsvn_subr/svn_base64.c +++ b/subversion/libsvn_subr/svn_base64.c
@@ -208,7 +208,7 @@ encode_data(void *baton, const char *data, apr_size_t *len) { struct encode_baton *eb = baton; - svn_stringbuf_t *encoded = svn_string_create_empty(eb->scratch_pool); + svn_stringbuf_t *encoded = svn_stringbuf_create_empty(eb->scratch_pool); apr_size_t enclen; svn_error_t *err = SVN_NO_ERROR; @@ -227,7 +227,7 @@ finish_encoding_data(void *baton) { struct encode_baton *eb = baton; - svn_stringbuf_t *encoded = svn_string_create_empty(eb->scratch_pool); + svn_stringbuf_t *encoded = svn_stringbuf_create_empty(eb->scratch_pool); apr_size_t enclen; svn_error_t *err = SVN_NO_ERROR; @@ -267,7 +267,7 @@ svn_boolean_t break_lines, apr_pool_t *pool) { - svn_stringbuf_t *encoded = svn_string_create_empty(pool); + svn_stringbuf_t *encoded = svn_stringbuf_create_empty(pool); unsigned char ingroup[3]; size_t ingrouplen = 0; size_t linelen = 0; @@ -461,7 +461,7 @@ svn_error_t *err = SVN_NO_ERROR; /* Decode this block of data. */ - decoded = svn_string_create_empty(db->scratch_pool); + decoded = svn_stringbuf_create_empty(db->scratch_pool); decode_bytes(decoded, data, *len, db->buf, &db->buflen, &db->done); /* Write the output, clean up, go home. */ @@ -507,7 +507,7 @@ const svn_string_t * svn_base64_decode_string(const svn_string_t *str, apr_pool_t *pool) { - svn_stringbuf_t *decoded = svn_string_create_empty(pool); + svn_stringbuf_t *decoded = svn_stringbuf_create_empty(pool); unsigned char ingroup[4]; int ingrouplen = 0; svn_boolean_t done = FALSE; @@ -531,7 +531,7 @@ unsigned char ingroup[3]; size_t ingrouplen = 0; size_t linelen = 0; - checksum_str = svn_string_create_empty(pool); + checksum_str = svn_stringbuf_create_empty(pool); encode_bytes(checksum_str, checksum->digest, svn_checksum_size(checksum), ingroup, &ingrouplen,
diff --git a/subversion/libsvn_subr/svn_string.c b/subversion/libsvn_subr/svn_string.c index f7c3b95..14a99f3 100644 --- a/subversion/libsvn_subr/svn_string.c +++ b/subversion/libsvn_subr/svn_string.c
@@ -747,7 +747,7 @@ const char *separator, apr_pool_t *pool) { - svn_stringbuf_t *new_str = svn_string_create_empty(pool); + svn_stringbuf_t *new_str = svn_stringbuf_create_empty(pool); size_t sep_len = strlen(separator); int i;
diff --git a/subversion/libsvn_subr/win32_xlate.c b/subversion/libsvn_subr/win32_xlate.c index cdc5d5b..f5fe0c9 100644 --- a/subversion/libsvn_subr/win32_xlate.c +++ b/subversion/libsvn_subr/win32_xlate.c
@@ -185,7 +185,7 @@ if (src_length == 0) { - *dest = svn_string_create_empty(pool); + *dest = svn_stringbuf_create_empty(pool); return APR_SUCCESS; }
diff --git a/subversion/libsvn_subr/xml.c b/subversion/libsvn_subr/xml.c index 5ec8a28..23e2a13 100644 --- a/subversion/libsvn_subr/xml.c +++ b/subversion/libsvn_subr/xml.c
@@ -115,7 +115,7 @@ const char *p = data, *q; if (*outstr == NULL) - *outstr = svn_string_create_empty(pool); + *outstr = svn_stringbuf_create_empty(pool); while (1) { @@ -277,7 +277,7 @@ if (q == end) return string; - outstr = svn_string_create_empty(pool); + outstr = svn_stringbuf_create_empty(pool); while (1) { q = p; @@ -479,7 +479,7 @@ { if (*str == NULL) - *str = svn_string_create_empty(pool); + *str = svn_stringbuf_create_empty(pool); svn_stringbuf_appendcstr(*str, "<?xml version=\"1.0\""); if (encoding) { @@ -646,7 +646,7 @@ const char *tagname) { if (*str == NULL) - *str = svn_string_create_empty(pool); + *str = svn_stringbuf_create_empty(pool); svn_stringbuf_appendcstr(*str, "</"); svn_stringbuf_appendcstr(*str, tagname);
diff --git a/subversion/mod_dav_svn/util.c b/subversion/mod_dav_svn/util.c index 29a8c7c..856be7d 100644 --- a/subversion/mod_dav_svn/util.c +++ b/subversion/mod_dav_svn/util.c
@@ -709,7 +709,7 @@ } else { - buf = svn_string_create_empty(pool); + buf = svn_stringbuf_create_empty(pool); } brigade = apr_brigade_create(r->pool, r->connection->bucket_alloc);
diff --git a/subversion/svn/blame-cmd.c b/subversion/svn/blame-cmd.c index 495409f..1899883 100644 --- a/subversion/svn/blame-cmd.c +++ b/subversion/svn/blame-cmd.c
@@ -283,7 +283,7 @@ if (! opt_state->xml) SVN_ERR(svn_stream_for_stdout(&bl.out, pool)); else - bl.sbuf = svn_string_create_empty(pool); + bl.sbuf = svn_stringbuf_create_empty(pool); bl.opt_state = opt_state;
diff --git a/subversion/svn/diff-cmd.c b/subversion/svn/diff-cmd.c index d1f8b0b..57eed26 100644 --- a/subversion/svn/diff-cmd.c +++ b/subversion/svn/diff-cmd.c
@@ -89,7 +89,7 @@ /* Full path to the object being diffed. This is created by taking the * baton, and appending the target's relative path. */ const char *path = *(const char **)baton; - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); /* Tack on the target path, so we can differentiate between different parts * of the output when we're given multiple targets. */ @@ -197,7 +197,7 @@ SVN_ERR(svn_cl__xml_print_header("diff", pool)); - sb = svn_string_create_empty(pool); + sb = svn_stringbuf_create_empty(pool); svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "paths", NULL); SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout)); } @@ -419,7 +419,7 @@ if (opt_state->xml) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); svn_xml_make_close_tag(&sb, pool, "paths"); SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout)); SVN_ERR(svn_cl__xml_print_footer("diff", pool));
diff --git a/subversion/svn/info-cmd.c b/subversion/svn/info-cmd.c index 4878089..7f63221 100644 --- a/subversion/svn/info-cmd.c +++ b/subversion/svn/info-cmd.c
@@ -85,7 +85,7 @@ const svn_client_info2_t *info, apr_pool_t *pool) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); const char *rev_str; const char *path_prefix = baton;
diff --git a/subversion/svn/list-cmd.c b/subversion/svn/list-cmd.c index ea4aa37..e16f75c 100644 --- a/subversion/svn/list-cmd.c +++ b/subversion/svn/list-cmd.c
@@ -156,7 +156,7 @@ if (pb->ctx->cancel_func) SVN_ERR(pb->ctx->cancel_func(pb->ctx->cancel_baton)); - sb = svn_string_create_empty(pool); + sb = svn_stringbuf_create_empty(pool); svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry", "kind", svn_cl__node_kind_str_xml(dirent->kind), @@ -276,7 +276,7 @@ if (opt_state->xml) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "list", "path", truepath[0] == '\0' ? "." : truepath, NULL); @@ -308,7 +308,7 @@ if (opt_state->xml) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); svn_xml_make_close_tag(&sb, pool, "list"); SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout)); }
diff --git a/subversion/svn/log-cmd.c b/subversion/svn/log-cmd.c index 09a9951..1b3ff26 100644 --- a/subversion/svn/log-cmd.c +++ b/subversion/svn/log-cmd.c
@@ -432,7 +432,7 @@ { struct log_receiver_baton *lb = baton; /* Collate whole log message into sb before printing. */ - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); char *revstr; const char *author; const char *date;
diff --git a/subversion/svn/props.c b/subversion/svn/props.c index f5b4de1..43bbafb 100644 --- a/subversion/svn/props.c +++ b/subversion/svn/props.c
@@ -156,7 +156,7 @@ apr_hash_index_t *hi; if (*outstr == NULL) - *outstr = svn_string_create_empty(pool); + *outstr = svn_stringbuf_create_empty(pool); for (hi = apr_hash_first(pool, prop_hash); hi; hi = apr_hash_next(hi)) {
diff --git a/subversion/svn/status-cmd.c b/subversion/svn/status-cmd.c index 37fc917..46d3bde 100644 --- a/subversion/svn/status-cmd.c +++ b/subversion/svn/status-cmd.c
@@ -106,7 +106,7 @@ static svn_error_t * print_start_target_xml(const char *target, apr_pool_t *pool) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "target", "path", target, NULL); @@ -122,7 +122,7 @@ print_finish_target_xml(svn_revnum_t repos_rev, apr_pool_t *pool) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); if (SVN_IS_VALID_REVNUM(repos_rev)) { @@ -355,7 +355,7 @@ svn_stringbuf_t *buf; if (opt_state->xml) - buf = svn_string_create_empty(scratch_pool); + buf = svn_stringbuf_create_empty(scratch_pool); for (hi = apr_hash_first(scratch_pool, master_cl_hash); hi; hi = apr_hash_next(hi))
diff --git a/subversion/svn/status.c b/subversion/svn/status.c index ccdf1f5..bd4821a 100644 --- a/subversion/svn/status.c +++ b/subversion/svn/status.c
@@ -424,7 +424,7 @@ svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); apr_hash_t *att_hash; const char *local_abspath = status->local_abspath; svn_boolean_t tree_conflicted = FALSE;
diff --git a/subversion/svn/util.c b/subversion/svn/util.c index 8f6e97d..e027143 100644 --- a/subversion/svn/util.c +++ b/subversion/svn/util.c
@@ -876,7 +876,7 @@ { SVN_ERR(svn_io_remove_file2(lmb->tmpfile_left, FALSE, pool)); *tmp_file = lmb->tmpfile_left = NULL; - message = svn_string_create_empty(pool); + message = svn_stringbuf_create_empty(pool); } /* If the user chooses anything else, the loop will @@ -1058,7 +1058,7 @@ svn_cl__xml_print_header(const char *tagname, apr_pool_t *pool) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); /* <?xml version="1.0" encoding="UTF-8"?> */ svn_xml_make_header2(&sb, "UTF-8", pool); @@ -1074,7 +1074,7 @@ svn_cl__xml_print_footer(const char *tagname, apr_pool_t *pool) { - svn_stringbuf_t *sb = svn_string_create_empty(pool); + svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool); /* "</TAGNAME>" */ svn_xml_make_close_tag(&sb, pool, tagname); @@ -1303,7 +1303,7 @@ const char *indent, apr_pool_t *pool) { - svn_stringbuf_t *out = svn_string_create_empty(pool); + svn_stringbuf_t *out = svn_stringbuf_create_empty(pool); const char *line; while ((line = next_line(&str, pool)))
diff --git a/subversion/svndumpfilter/main.c b/subversion/svndumpfilter/main.c index 7093e16..bb22906 100644 --- a/subversion/svndumpfilter/main.c +++ b/subversion/svndumpfilter/main.c
@@ -271,7 +271,7 @@ rb->has_props = FALSE; rb->had_dropped_nodes = FALSE; rb->writing_begun = FALSE; - rb->header = svn_string_create_empty(pool); + rb->header = svn_stringbuf_create_empty(pool); rb->props = apr_hash_make(pool); header_stream = svn_stream_from_stringbuf(rb->header, pool); @@ -322,7 +322,7 @@ char buf[SVN_KEYLINE_MAXLEN]; apr_hash_index_t *hi; apr_pool_t *hash_pool = apr_hash_pool_get(rb->props); - svn_stringbuf_t *props = svn_string_create_empty(hash_pool); + svn_stringbuf_t *props = svn_stringbuf_create_empty(hash_pool); apr_pool_t *subpool = svn_pool_create(hash_pool); rb->writing_begun = TRUE; @@ -551,8 +551,8 @@ nb->has_text = FALSE; nb->writing_begun = FALSE; nb->tcl = tcl ? svn__atoui64(tcl) : 0; - nb->header = svn_string_create_empty(pool); - nb->props = svn_string_create_empty(pool); + nb->header = svn_stringbuf_create_empty(pool); + nb->props = svn_stringbuf_create_empty(pool); /* Now we know for sure that we have a node that will not be skipped, flush the revision if it has not already been done. */
diff --git a/subversion/svnlook/main.c b/subversion/svnlook/main.c index 0f0d3a6..47e499f 100644 --- a/subversion/svnlook/main.c +++ b/subversion/svnlook/main.c
@@ -921,7 +921,7 @@ if (! node) return SVN_NO_ERROR; - header = svn_string_create_empty(pool); + header = svn_stringbuf_create_empty(pool); /* Print copyfrom history for the top node of a copied tree. */ if ((SVN_IS_VALID_REVNUM(node->copyfrom_rev))
diff --git a/subversion/svnrdump/dump_editor.c b/subversion/svnrdump/dump_editor.c index fdbe46c..64e4c60 100644 --- a/subversion/svnrdump/dump_editor.c +++ b/subversion/svnrdump/dump_editor.c
@@ -383,7 +383,7 @@ eb->props = apr_hash_make(eb->pool); eb->deleted_props = apr_hash_make(eb->pool); - eb->propstring = svn_string_create_empty(eb->pool); + eb->propstring = svn_stringbuf_create_empty(eb->pool); *root_baton = make_dir_baton(NULL, NULL, SVN_INVALID_REVNUM, edit_baton, NULL, FALSE, eb->pool);
diff --git a/subversion/svnrdump/svnrdump.c b/subversion/svnrdump/svnrdump.c index 9560adc..d05df64 100644 --- a/subversion/svnrdump/svnrdump.c +++ b/subversion/svnrdump/svnrdump.c
@@ -311,7 +311,7 @@ ": %ld\n", revision)); prophash = apr_hash_make(pool); - propstring = svn_string_create_empty(pool); + propstring = svn_stringbuf_create_empty(pool); SVN_ERR(svn_ra_rev_proplist(session, revision, &prophash, pool)); propstream = svn_stream_from_stringbuf(propstring, pool);
diff --git a/subversion/svnserve/serve.c b/subversion/svnserve/serve.c index 6ed48b9..4c77b04 100644 --- a/subversion/svnserve/serve.c +++ b/subversion/svnserve/serve.c
@@ -3072,7 +3072,7 @@ apr_array_header_t *caplist, *cap_words; server_baton_t b; fs_warning_baton_t warn_baton; - svn_stringbuf_t *cap_log = svn_string_create_empty(pool); + svn_stringbuf_t *cap_log = svn_stringbuf_create_empty(pool); b.tunnel = params->tunnel; b.tunnel_user = get_tunnel_user(params, pool);
diff --git a/subversion/svnsync/sync.c b/subversion/svnsync/sync.c index 5057394..9e9db14 100644 --- a/subversion/svnsync/sync.c +++ b/subversion/svnsync/sync.c
@@ -461,7 +461,7 @@ are relative URLs, whereas svn:mergeinfo uses relative paths (not URI-encoded). */ svn_error_t *err; - svn_stringbuf_t *mergeinfo_buf = svn_string_create_empty(pool); + svn_stringbuf_t *mergeinfo_buf = svn_stringbuf_create_empty(pool); svn_mergeinfo_t mergeinfo; int i; apr_array_header_t *sources =
diff --git a/subversion/tests/libsvn_diff/diff-diff3-test.c b/subversion/tests/libsvn_diff/diff-diff3-test.c index 76ca28a..f470ffa 100644 --- a/subversion/tests/libsvn_diff/diff-diff3-test.c +++ b/subversion/tests/libsvn_diff/diff-diff3-test.c
@@ -175,7 +175,7 @@ SVN_ERR(svn_diff_mem_string_diff3(&diff, original, modified, latest, options, pool)); - actual = svn_string_create_empty(pool); + actual = svn_stringbuf_create_empty(pool); ostream = svn_stream_from_stringbuf(actual, pool); SVN_ERR(svn_diff_mem_string_output_merge2 @@ -265,7 +265,7 @@ SVN_ERR(svn_diff_mem_string_diff(&diff, original, modified, options, pool)); - actual = svn_string_create_empty(pool); + actual = svn_stringbuf_create_empty(pool); ostream = svn_stream_from_stringbuf(actual, pool); SVN_ERR(svn_diff_mem_string_output_unified(ostream, diff,
diff --git a/subversion/tests/libsvn_fs_base/strings-reps-test.c b/subversion/tests/libsvn_fs_base/strings-reps-test.c index 845cafa..4512eef 100644 --- a/subversion/tests/libsvn_fs_base/strings-reps-test.c +++ b/subversion/tests/libsvn_fs_base/strings-reps-test.c
@@ -360,7 +360,7 @@ size, expected_len); /* Read the string back in 100-byte chunks. */ - text = svn_string_create_empty(trail->pool); + text = svn_stringbuf_create_empty(trail->pool); while (1) { size = sizeof(buf);
diff --git a/subversion/tests/libsvn_subr/path-test.c b/subversion/tests/libsvn_subr/path-test.c index 1552db8..0faa6d3 100644 --- a/subversion/tests/libsvn_subr/path-test.c +++ b/subversion/tests/libsvn_subr/path-test.c
@@ -871,7 +871,7 @@ int i; svn_stringbuf_t *buf; - buf = svn_string_create_empty(pool); + buf = svn_stringbuf_create_empty(pool); i = 0; while (tests[i].path)
diff --git a/subversion/tests/libsvn_subr/stream-test.c b/subversion/tests/libsvn_subr/stream-test.c index 79132fc..9f13533 100644 --- a/subversion/tests/libsvn_subr/stream-test.c +++ b/subversion/tests/libsvn_subr/stream-test.c
@@ -67,7 +67,7 @@ apr_size_t len; inbuf = svn_stringbuf_create(strings[i], subpool); - outbuf = svn_string_create_empty(subpool); + outbuf = svn_stringbuf_create_empty(subpool); stream = svn_stream_from_stringbuf(inbuf, subpool); len = TEST_BUF_SIZE; while (len == TEST_BUF_SIZE) @@ -94,7 +94,7 @@ apr_size_t amt_read, len; inbuf = svn_stringbuf_create(strings[i], subpool); - outbuf = svn_string_create_empty(subpool); + outbuf = svn_stringbuf_create_empty(subpool); stream = svn_stream_from_stringbuf(outbuf, subpool); amt_read = 0; while (amt_read < inbuf->len) @@ -125,7 +125,7 @@ static svn_stringbuf_t * generate_test_bytes(int num_bytes, apr_pool_t *pool) { - svn_stringbuf_t *buffer = svn_string_create_empty(pool); + svn_stringbuf_t *buffer = svn_stringbuf_create_empty(pool); int total, repeat, repeat_iter; char c; @@ -189,8 +189,8 @@ apr_size_t len; origbuf = bufs[i]; - inbuf = svn_string_create_empty(subpool); - outbuf = svn_string_create_empty(subpool); + inbuf = svn_stringbuf_create_empty(subpool); + outbuf = svn_stringbuf_create_empty(subpool); stream = svn_stream_compressed(svn_stream_from_stringbuf(outbuf, subpool), @@ -232,8 +232,8 @@ test_stream_tee(apr_pool_t *pool) { svn_stringbuf_t *test_bytes = generate_test_bytes(100, pool); - svn_stringbuf_t *output_buf1 = svn_string_create_empty(pool); - svn_stringbuf_t *output_buf2 = svn_string_create_empty(pool); + svn_stringbuf_t *output_buf1 = svn_stringbuf_create_empty(pool); + svn_stringbuf_t *output_buf2 = svn_stringbuf_create_empty(pool); svn_stream_t *source_stream = svn_stream_from_stringbuf(test_bytes, pool); svn_stream_t *output_stream1 = svn_stream_from_stringbuf(output_buf1, pool); svn_stream_t *output_stream2 = svn_stream_from_stringbuf(output_buf2, pool); @@ -538,8 +538,8 @@ test_stream_base64(apr_pool_t *pool) { svn_stream_t *stream; - svn_stringbuf_t *actual = svn_string_create_empty(pool); - svn_stringbuf_t *expected = svn_string_create_empty(pool); + svn_stringbuf_t *actual = svn_stringbuf_create_empty(pool); + svn_stringbuf_t *expected = svn_stringbuf_create_empty(pool); int i; static const char *strings[] = { "fairly boring test data... blah blah",
diff --git a/subversion/tests/libsvn_subr/string-test.c b/subversion/tests/libsvn_subr/string-test.c index 2b5e151..4c8faf0 100644 --- a/subversion/tests/libsvn_subr/string-test.c +++ b/subversion/tests/libsvn_subr/string-test.c
@@ -419,7 +419,7 @@ static svn_error_t * test16(apr_pool_t *pool) { - a = svn_string_create_empty(pool); + a = svn_stringbuf_create_empty(pool); return test_find_char_backward(a->data, a->len, ',', 0, pool); }
diff --git a/subversion/tests/svn_test_fs.c b/subversion/tests/svn_test_fs.c index fd47634..3811cbb 100644 --- a/subversion/tests/svn_test_fs.c +++ b/subversion/tests/svn_test_fs.c
@@ -251,7 +251,7 @@ of priorities today, though. */ apr_size_t len; - svn_stringbuf_t *str = svn_string_create_empty(pool); + svn_stringbuf_t *str = svn_stringbuf_create_empty(pool); do { @@ -442,7 +442,7 @@ { /* If we don't have a corrupt entries string, make one. */ if (! corrupt_entries) - corrupt_entries = svn_string_create_empty(subpool); + corrupt_entries = svn_stringbuf_create_empty(subpool); /* Append this entry name to the list of corrupt entries. */ svn_stringbuf_appendcstr(corrupt_entries, " "); @@ -458,7 +458,7 @@ { /* If we don't have a missing entries string, make one. */ if (! missing_entries) - missing_entries = svn_string_create_empty(subpool); + missing_entries = svn_stringbuf_create_empty(subpool); /* Append this entry name to the list of missing entries. */ svn_stringbuf_appendcstr(missing_entries, " "); @@ -481,7 +481,7 @@ /* If we don't have an extra entries string, make one. */ if (! extra_entries) - extra_entries = svn_string_create_empty(subpool); + extra_entries = svn_stringbuf_create_empty(subpool); /* Append this entry name to the list of missing entries. */ svn_stringbuf_appendcstr(extra_entries, " ");