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 2011/10/28 22:42:49 UTC
svn commit: r1190555 - in
/subversion/branches/integrate-string-improvements/subversion:
libsvn_client/ libsvn_delta/ libsvn_ra_serf/ libsvn_subr/ libsvn_wc/
mod_dav_svn/ svn/ svnadmin/ svnlook/ svnsync/
Author: stefan2
Date: Fri Oct 28 20:42:48 2011
New Revision: 1190555
URL: http://svn.apache.org/viewvc?rev=1190555&view=rev
Log:
Global search and replace: Instead of svn_string_create("", *) use the new,
more efficient svn_string_create_empty(*) API.
* subversion/libsvn_client/add.c
(svn_client__get_auto_props): use the new API
* subversion/libsvn_client/diff.c
(display_prop_diffs): ditto
* subversion/libsvn_client/merge.c
(calculate_left_hand_side): ditto
* subversion/libsvn_delta/svndiff.c
(window_handler): ditto
* subversion/libsvn_ra_serf/blame.c
(create_propval): ditto
* subversion/libsvn_ra_serf/commit.c
(change_dir_prop, change_file_prop, svn_ra_serf__change_rev_prop): ditto
* subversion/libsvn_subr/mergeinfo.c
(svn_mergeinfo_to_string, svn_mergeinfo__to_formatted_string): ditto
* subversion/libsvn_subr/opt.c
(svn_opt_parse_revprop): ditto
* subversion/libsvn_wc/props.c
(prop_conflict_from_skel): ditto
* subversion/mod_dav_svn/util.c
(request_body_to_string): ditto
* subversion/svn/propedit-cmd.c
(svn_cl__propedit): ditto
* subversion/svn/util.c
(svn_cl__edit_string_externally, svn_cl__get_log_message): ditto
* subversion/svnadmin/main.c
(set_revprop): ditto
* subversion/svnlook/main.c
(display_prop_diffs): ditto
* subversion/svnsync/main.c
(replay_rev_started): ditto
Modified:
subversion/branches/integrate-string-improvements/subversion/libsvn_client/add.c
subversion/branches/integrate-string-improvements/subversion/libsvn_client/diff.c
subversion/branches/integrate-string-improvements/subversion/libsvn_client/merge.c
subversion/branches/integrate-string-improvements/subversion/libsvn_delta/svndiff.c
subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/blame.c
subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/commit.c
subversion/branches/integrate-string-improvements/subversion/libsvn_subr/mergeinfo.c
subversion/branches/integrate-string-improvements/subversion/libsvn_subr/opt.c
subversion/branches/integrate-string-improvements/subversion/libsvn_wc/props.c
subversion/branches/integrate-string-improvements/subversion/mod_dav_svn/util.c
subversion/branches/integrate-string-improvements/subversion/svn/propedit-cmd.c
subversion/branches/integrate-string-improvements/subversion/svn/util.c
subversion/branches/integrate-string-improvements/subversion/svnadmin/main.c
subversion/branches/integrate-string-improvements/subversion/svnlook/main.c
subversion/branches/integrate-string-improvements/subversion/svnsync/main.c
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_client/add.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_client/add.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_client/add.c Fri Oct 28 20:42:48 2011
@@ -293,7 +293,7 @@ svn_client__get_auto_props(apr_hash_t **
if (executable)
apr_hash_set(autoprops.properties, SVN_PROP_EXECUTABLE,
strlen(SVN_PROP_EXECUTABLE),
- svn_string_create("", pool));
+ svn_string_create_empty(pool));
}
*mimetype = autoprops.mimetype;
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_client/diff.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_client/diff.c Fri Oct 28 20:42:48 2011
@@ -664,12 +664,12 @@ display_prop_diffs(const apr_array_heade
Since the diff is not useful anyway for patching properties an
eol character is appended when needed to remove those pescious
' \ No newline at end of file' lines. */
- tmp = original_value ? original_value : svn_string_create("",
- iterpool);
+ tmp = original_value ? original_value
+ : svn_string_create_empty(iterpool);
orig = maybe_append_eol(tmp, iterpool);
tmp = propchange->value ? propchange->value :
- svn_string_create("", iterpool);
+ svn_string_create_empty(iterpool);
val = maybe_append_eol(tmp, iterpool);
SVN_ERR(svn_diff_mem_string_diff(&diff, orig, val, &options,
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_client/merge.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_client/merge.c Fri Oct 28 20:42:48 2011
@@ -10442,7 +10442,7 @@ calculate_left_hand_side(const char **ur
if (!apr_hash_get(subtrees_with_mergeinfo, target_abspath,
APR_HASH_KEY_STRING))
apr_hash_set(subtrees_with_mergeinfo, target_abspath,
- APR_HASH_KEY_STRING, svn_string_create("", result_pool));
+ APR_HASH_KEY_STRING, svn_string_create_empty(result_pool));
/* Get the history (segments) for TARGET_ABSPATH and any of its subtrees
with explicit mergeinfo. */
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_delta/svndiff.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_delta/svndiff.c Fri Oct 28 20:42:48 2011
@@ -255,7 +255,7 @@ window_handler(svn_txdelta_window_t *win
if (eb->version == 1)
{
svn_stringbuf_t *temp = svn_stringbuf_create_empty(pool);
- svn_string_t *tempstr = svn_string_create("", pool);
+ svn_string_t *tempstr = svn_string_create_empty(pool);
SVN_ERR(zlib_encode(window->new_data->data, window->new_data->len,
temp, eb->compression_level));
tempstr->data = temp->data;
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/blame.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/blame.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/blame.c Fri Oct 28 20:42:48 2011
@@ -151,7 +151,7 @@ create_propval(blame_info_t *info)
if (!info->prop_attr)
{
- return svn_string_create("", info->pool);
+ return svn_string_create_empty(info->pool);
}
else
{
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/commit.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_ra_serf/commit.c Fri Oct 28 20:42:48 2011
@@ -1800,7 +1800,7 @@ change_dir_prop(void *dir_baton,
}
else
{
- value = svn_string_create("", dir->pool);
+ value = svn_string_create_empty(dir->pool);
svn_ra_serf__set_prop(dir->removed_props, proppatch_target,
ns, name, value, dir->pool);
}
@@ -2048,7 +2048,7 @@ change_file_prop(void *file_baton,
}
else
{
- value = svn_string_create("", file->pool);
+ value = svn_string_create_empty(file->pool);
svn_ra_serf__set_prop(file->removed_props, file->url,
ns, name, value, file->pool);
@@ -2462,7 +2462,7 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
}
else if (old_value_p)
{
- svn_string_t *dummy_value = svn_string_create("", proppatch_ctx->pool);
+ svn_string_t *dummy_value = svn_string_create_empty(proppatch_ctx->pool);
svn_ra_serf__set_prop(proppatch_ctx->previous_removed_props,
proppatch_ctx->path,
@@ -2476,7 +2476,7 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
}
else
{
- value = svn_string_create("", proppatch_ctx->pool);
+ value = svn_string_create_empty(proppatch_ctx->pool);
svn_ra_serf__set_prop(proppatch_ctx->removed_props, proppatch_ctx->path,
ns, name, value, proppatch_ctx->pool);
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_subr/mergeinfo.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_subr/mergeinfo.c Fri Oct 28 20:42:48 2011
@@ -1920,7 +1920,7 @@ svn_mergeinfo_to_string(svn_string_t **o
}
else
{
- *output = svn_string_create("", pool);
+ *output = svn_string_create_empty(pool);
}
return SVN_NO_ERROR;
}
@@ -2321,7 +2321,7 @@ svn_mergeinfo__to_formatted_string(svn_s
#endif
*output = output_buf ? svn_stringbuf__morph_into_string(output_buf)
- : svn_string_create("", pool);
+ : svn_string_create_empty(pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_subr/opt.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_subr/opt.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_subr/opt.c Fri Oct 28 20:42:48 2011
@@ -944,7 +944,7 @@ svn_opt_parse_revprop(apr_hash_t **revpr
else
{
SVN_ERR(svn_utf_cstring_to_utf8(&propname, revprop_spec, pool));
- propval = svn_string_create("", pool);
+ propval = svn_string_create_empty(pool);
}
if (!svn_prop_name_is_valid(propname))
Modified: subversion/branches/integrate-string-improvements/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/libsvn_wc/props.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/libsvn_wc/props.c Fri Oct 28 20:42:48 2011
@@ -595,9 +595,9 @@ prop_conflict_from_skel(const svn_string
incoming_base, scratch_pool);
if (mine == NULL)
- mine = svn_string_create("", scratch_pool);
+ mine = svn_string_create_empty(scratch_pool);
if (incoming == NULL)
- incoming = svn_string_create("", scratch_pool);
+ incoming = svn_string_create_empty(scratch_pool);
/* Pick a suitable base for the conflict diff.
* The incoming value is always a change,
@@ -607,7 +607,7 @@ prop_conflict_from_skel(const svn_string
if (incoming_base)
original = incoming_base;
else
- original = svn_string_create("", scratch_pool);
+ original = svn_string_create_empty(scratch_pool);
}
else if (incoming_base && svn_string_compare(original, mine))
original = incoming_base;
Modified: subversion/branches/integrate-string-improvements/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/mod_dav_svn/util.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/mod_dav_svn/util.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/mod_dav_svn/util.c Fri Oct 28 20:42:48 2011
@@ -765,7 +765,7 @@ request_body_to_string(svn_string_t **re
apr_brigade_destroy(brigade);
/* Make an svn_string_t from our svn_stringbuf_t. */
- *request_str = svn_string_create("", pool);
+ *request_str = svn_string_create_empty(pool);
(*request_str)->data = buf->data;
(*request_str)->len = buf->len;
return OK;
Modified: subversion/branches/integrate-string-improvements/subversion/svn/propedit-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/svn/propedit-cmd.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/svn/propedit-cmd.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/svn/propedit-cmd.c Fri Oct 28 20:42:48 2011
@@ -122,7 +122,7 @@ svn_cl__propedit(apr_getopt_t *os,
if (! propval)
{
- propval = svn_string_create("", pool);
+ propval = svn_string_create_empty(pool);
/* This is how we signify to svn_client_revprop_set2() that
we want it to check that the original value hasn't
changed, but that that original value was non-existent: */
@@ -239,7 +239,7 @@ svn_cl__propedit(apr_getopt_t *os,
/* Get the property value. */
propval = apr_hash_get(props, abspath_or_url, APR_HASH_KEY_STRING);
if (! propval)
- propval = svn_string_create("", subpool);
+ propval = svn_string_create_empty(subpool);
if (svn_path_is_url(target))
{
Modified: subversion/branches/integrate-string-improvements/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/svn/util.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/svn/util.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/svn/util.c Fri Oct 28 20:42:48 2011
@@ -326,7 +326,7 @@ svn_cl__edit_string_externally(svn_strin
SVN_ERR(svn_subst_translate_cstring2(contents->data, &translated,
APR_EOL_STR, FALSE,
NULL, FALSE, pool));
- translated_contents = svn_string_create("", pool);
+ translated_contents = svn_string_create_empty(pool);
if (encoding)
SVN_ERR(svn_utf_cstring_from_utf8_ex2(&translated_contents->data,
translated, encoding, pool));
@@ -737,7 +737,7 @@ svn_cl__get_log_message(const char **log
int i;
svn_stringbuf_t *tmp_message = svn_stringbuf_dup(default_msg, pool);
svn_error_t *err = SVN_NO_ERROR;
- svn_string_t *msg_string = svn_string_create("", pool);
+ svn_string_t *msg_string = svn_string_create_empty(pool);
for (i = 0; i < commit_items->nelts; i++)
{
Modified: subversion/branches/integrate-string-improvements/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/svnadmin/main.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/svnadmin/main.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/svnadmin/main.c Fri Oct 28 20:42:48 2011
@@ -1197,7 +1197,7 @@ set_revprop(const char *prop_name, const
struct svnadmin_opt_state *opt_state, apr_pool_t *pool)
{
svn_repos_t *repos;
- svn_string_t *prop_value = svn_string_create("", pool);
+ svn_string_t *prop_value = svn_string_create_empty(pool);
svn_stringbuf_t *file_contents;
SVN_ERR(svn_stringbuf_from_file2(&file_contents, filename, pool));
Modified: subversion/branches/integrate-string-improvements/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/svnlook/main.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/svnlook/main.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/svnlook/main.c Fri Oct 28 20:42:48 2011
@@ -867,11 +867,11 @@ display_prop_diffs(const apr_array_heade
Since the diff is not useful anyway for patching properties an
eol character is appended when needed to remove those pescious
' \ No newline at end of file' lines. */
- tmp = orig_value ? orig_value : svn_string_create("", pool);
+ tmp = orig_value ? orig_value : svn_string_create_empty(pool);
orig = maybe_append_eol(tmp, pool);
tmp = pc->value ? pc->value :
- svn_string_create("", pool);
+ svn_string_create_empty(pool);
val = maybe_append_eol(tmp, pool);
SVN_ERR(svn_diff_mem_string_diff(&diff, orig, val, &options, pool));
Modified: subversion/branches/integrate-string-improvements/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/integrate-string-improvements/subversion/svnsync/main.c?rev=1190555&r1=1190554&r2=1190555&view=diff
==============================================================================
--- subversion/branches/integrate-string-improvements/subversion/svnsync/main.c (original)
+++ subversion/branches/integrate-string-improvements/subversion/svnsync/main.c Fri Oct 28 20:42:48 2011
@@ -1087,7 +1087,7 @@ replay_rev_started(svn_revnum_t revision
replay_rev_finished callback. */
if (! apr_hash_get(filtered, SVN_PROP_REVISION_LOG, APR_HASH_KEY_STRING))
apr_hash_set(filtered, SVN_PROP_REVISION_LOG, APR_HASH_KEY_STRING,
- svn_string_create("", pool));
+ svn_string_create_empty(pool));
/* If necessary, normalize encoding and line ending style. Add the number
of properties that required EOL normalization to the overall count