Author: danielsh
Date: Wed Oct 17 22:22:08 2012
New Revision: 1399462
URL: http://svn.apache.org/viewvc?rev=1399462&view=rev
Log:
* everywhere: Add missing SVN_ERR() wraps.
(This is a semiautomated commit: I added 'warn_unused_result' attributes,
compiled, then used a macro to add the SVN_ERR() wraps.)
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_subr/gpg_agent.c
subversion/trunk/subversion/libsvn_subr/named_atomic.c
subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/trunk/subversion/libsvn_subr/utf.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/svn/proplist-cmd.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/trunk/tools/server-side/fsfs-reorg.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Oct 17 22:22:08 2012
@@ -2725,7 +2725,7 @@ merge_dir_closed(svn_wc_notify_state_t *
merge_cmd_baton_t *merge_b = baton;
if (merge_b->dry_run)
- svn_hash__clear(merge_b->dry_run_deletions, scratch_pool);
+ SVN_ERR(svn_hash__clear(merge_b->dry_run_deletions, scratch_pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Wed Oct 17 22:22:08 2012
@@ -335,8 +335,8 @@ password_get_gpg_agent(svn_boolean_t *do
/* Create the CACHE_ID which will be generated based on REALMSTRING similar
to other password caching mechanisms. */
- svn_checksum(&digest, svn_checksum_md5, realmstring, strlen(realmstring),
- pool);
+ SVN_ERR(svn_checksum(&digest, svn_checksum_md5, realmstring,
+ strlen(realmstring), pool));
cache_id = svn_checksum_to_cstring(digest, pool);
password_prompt = apr_psprintf(pool, _("Password for '%s': "), username);
Modified: subversion/trunk/subversion/libsvn_subr/named_atomic.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/named_atomic.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/named_atomic.c (original)
+++ subversion/trunk/subversion/libsvn_subr/named_atomic.c Wed Oct 17 22:22:08
2012
@@ -396,10 +396,8 @@ svn_atomic_namespace__create(svn_atomic_
/* initialize the lock objects
*/
- svn_atomic__init_once(&mutex_initialized,
- init_thread_mutex,
- NULL,
- result_pool);
+ SVN_ERR(svn_atomic__init_once(&mutex_initialized, init_thread_mutex, NULL,
+ result_pool));
new_ns->mutex.pool = result_pool;
SVN_ERR(svn_io_file_open(&new_ns->mutex.lock_file, lock_name,
Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.c Wed Oct 17 22:22:08 2012
@@ -363,7 +363,7 @@ lsb_release(apr_pool_t *pool)
else if (0 == svn_cstring_casecmp(key, "Codename"))
codename = line->data;
}
- svn_stream_close(lsbinfo);
+ SVN_ERR(svn_stream_close(lsbinfo));
if (err)
{
svn_error_clear(err);
Modified: subversion/trunk/subversion/libsvn_subr/utf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf.c Wed Oct 17 22:22:08 2012
@@ -892,7 +892,7 @@ svn_utf_stringbuf_from_utf8(svn_stringbu
*dest = svn_stringbuf_dup(src, pool);
}
- put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool);
+ SVN_ERR(put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool));
return err;
}
@@ -925,7 +925,7 @@ svn_utf_string_from_utf8(const svn_strin
*dest = svn_string_dup(src, pool);
}
- put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool);
+ SVN_ERR(put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool));
return err;
}
@@ -943,7 +943,7 @@ svn_utf_cstring_from_utf8(const char **d
SVN_ERR(get_uton_xlate_handle_node(&node, pool));
err = convert_cstring(dest, src, node, pool);
- put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool);
+ SVN_ERR(put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool));
return err;
}
@@ -965,7 +965,7 @@ svn_utf_cstring_from_utf8_ex2(const char
SVN_ERR(get_xlate_handle_node(&node, topage, SVN_APR_UTF8_CHARSET,
convset_key, pool));
err = convert_cstring(dest, src, node, pool);
- put_xlate_handle_node(node, convset_key, pool);
+ SVN_ERR(put_xlate_handle_node(node, convset_key, pool));
return err;
}
@@ -1062,7 +1062,7 @@ svn_utf_cstring_from_utf8_string(const c
*dest = apr_pstrmemdup(pool, src->data, src->len);
}
- put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool);
+ SVN_ERR(put_xlate_handle_node(node, SVN_UTF_UTON_XLATE_HANDLE, pool));
return err;
}
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Wed Oct 17 22:22:08 2012
@@ -1162,7 +1162,7 @@ svn_wc__conflict_create_markers(svn_skel
{
const char *propname = svn__apr_hash_index_key(hi);
- prop_conflict_skel_add(
+ SVN_ERR(prop_conflict_skel_add(
prop_data, propname,
old_props
? apr_hash_get(old_props, propname,
@@ -1180,7 +1180,7 @@ svn_wc__conflict_create_markers(svn_skel
? apr_hash_get(their_original_props,
propname,
APR_HASH_KEY_STRING)
: NULL,
- result_pool, scratch_pool);
+ result_pool, scratch_pool));
}
SVN_ERR(svn_wc__wq_build_prej_install(work_items,
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Oct 17 22:22:08
2012
@@ -1629,7 +1629,7 @@ delete_entry(const char *path,
if (is_root)
{
/* Just skip this node; a future update will handle it */
- remember_skipped_tree(eb, local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, local_abspath, pool));
do_notification(eb, local_abspath, svn_node_unknown,
svn_wc_notify_update_skip_obstruction, scratch_pool);
@@ -1918,7 +1918,7 @@ add_directory(const char *path,
NULL, NULL,
pool));
- remember_skipped_tree(eb, db->local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, db->local_abspath, pool));
db->skip_this = TRUE;
db->already_notified = TRUE;
@@ -1942,7 +1942,7 @@ add_directory(const char *path,
file externals.
*/
- remember_skipped_tree(eb, db->local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, db->local_abspath, pool));
db->skip_this = TRUE;
db->already_notified = TRUE;
@@ -2200,7 +2200,7 @@ open_directory(const char *path,
if (is_root)
{
/* Just skip this node; a future update will handle it */
- remember_skipped_tree(eb, db->local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, db->local_abspath, pool));
db->skip_this = TRUE;
db->already_notified = TRUE;
@@ -2993,7 +2993,7 @@ add_file(const char *path,
apr_hash_set(pb->not_present_files, apr_pstrdup(pb->pool, fb->name),
APR_HASH_KEY_STRING, (void*)1);
- remember_skipped_tree(eb, fb->local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, fb->local_abspath, pool));
fb->skip_this = TRUE;
fb->already_notified = TRUE;
@@ -3018,7 +3018,7 @@ add_file(const char *path,
The reason we get here is that the adm crawler doesn't report
file externals.
*/
- remember_skipped_tree(eb, fb->local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, fb->local_abspath, pool));
fb->skip_this = TRUE;
fb->already_notified = TRUE;
@@ -3263,7 +3263,7 @@ open_file(const char *path,
if (is_root)
{
/* Just skip this node; a future update will handle it */
- remember_skipped_tree(eb, fb->local_abspath, pool);
+ SVN_ERR(remember_skipped_tree(eb, fb->local_abspath, pool));
fb->skip_this = TRUE;
fb->already_notified = TRUE;
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Oct 17 22:22:08 2012
@@ -2231,8 +2231,8 @@ get_resource(request_rec *r,
}
/* Configure hook script environment variables. */
- svn_repos_hooks_setenv(repos->repos, dav_svn__get_hooks_env(r),
- r->connection->pool, r->pool);
+ SVN_ERR(svn_repos_hooks_setenv(repos->repos, dav_svn__get_hooks_env(r),
+ r->connection->pool, r->pool));
}
/* cache the filesystem object */
Modified: subversion/trunk/subversion/svn/proplist-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/proplist-cmd.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/proplist-cmd.c (original)
+++ subversion/trunk/subversion/svn/proplist-cmd.c Wed Oct 17 22:22:08 2012
@@ -86,7 +86,7 @@ proplist_receiver_xml(void *baton,
(! opt_state->verbose),
TRUE, iterpool));
svn_xml_make_close_tag(&sb, iterpool, "target");
- svn_cl__error_checked_fputs(sb->data, stdout);
+ SVN_ERR(svn_cl__error_checked_fputs(sb->data, stdout));
}
svn_pool_destroy(iterpool);
}
Modified: subversion/trunk/subversion/svnserve/serve.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Wed Oct 17 22:22:08 2012
@@ -3144,8 +3144,8 @@ static svn_error_t *find_repos(const cha
#ifdef SVN_HAVE_SASL
/* Should we use Cyrus SASL? */
- svn_config_get_bool(b->cfg, &b->use_sasl, SVN_CONFIG_SECTION_SASL,
- SVN_CONFIG_OPTION_USE_SASL, FALSE);
+ SVN_ERR(svn_config_get_bool(b->cfg, &b->use_sasl, SVN_CONFIG_SECTION_SASL,
+ SVN_CONFIG_OPTION_USE_SASL, FALSE));
#endif
/* Use the repository UUID as the default realm. */
@@ -3169,7 +3169,7 @@ static svn_error_t *find_repos(const cha
SVN_CONFIG_OPTION_HOOKS_ENV, NULL);
if (hooks_env)
hooks_env = svn_dirent_internal_style(hooks_env, pool);
- svn_repos_hooks_setenv(b->repos, hooks_env, pool, pool);
+ SVN_ERR(svn_repos_hooks_setenv(b->repos, hooks_env, pool, pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/auth-test.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/auth-test.c Wed Oct 17
22:22:08 2012
@@ -143,8 +143,8 @@ test_platform_specific_auth_providers(ap
/* Test GNOME Keyring auth providers */
#ifdef SVN_HAVE_GNOME_KEYRING
- svn_auth_get_platform_specific_provider(&provider, "gnome_keyring",
- "simple", pool);
+ SVN_ERR(svn_auth_get_platform_specific_provider(&provider, "gnome_keyring",
+ "simple", pool));
if (!provider)
return svn_error_createf
@@ -152,8 +152,8 @@ test_platform_specific_auth_providers(ap
"svn_auth_get_platform_specific_provider('gnome_keyring', 'simple') "
"should not return NULL");
- svn_auth_get_platform_specific_provider(&provider, "gnome_keyring",
- "ssl_client_cert_pw", pool);
+ SVN_ERR(svn_auth_get_platform_specific_provider(&provider, "gnome_keyring",
+ "ssl_client_cert_pw", pool));
if (!provider)
return svn_error_createf
@@ -162,8 +162,8 @@ test_platform_specific_auth_providers(ap
"'ssl_client_cert_pw') should not return NULL");
/* Make sure you do not get a Windows auth provider */
- svn_auth_get_platform_specific_provider(&provider, "windows",
- "simple", pool);
+ SVN_ERR(svn_auth_get_platform_specific_provider(&provider, "windows",
+ "simple", pool));
if (provider)
return svn_error_createf
Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Wed Oct 17
22:22:08 2012
@@ -86,8 +86,10 @@ compare_conflict(const svn_wc_conflict_d
SVN_TEST_STRING_ASSERT(expected->my_abspath, actual->my_abspath);
SVN_TEST_STRING_ASSERT(expected->merged_file, actual->merged_file);
SVN_TEST_ASSERT(expected->operation == actual->operation);
- compare_version(expected->src_left_version, actual->src_left_version);
- compare_version(expected->src_right_version, actual->src_right_version);
+ SVN_ERR(compare_version(expected->src_left_version,
+ actual->src_left_version));
+ SVN_ERR(compare_version(expected->src_right_version,
+ actual->src_right_version));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/tools/server-side/fsfs-reorg.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/fsfs-reorg.c?rev=1399462&r1=1399461&r2=1399462&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/fsfs-reorg.c (original)
+++ subversion/trunk/tools/server-side/fsfs-reorg.c Wed Oct 17 22:22:08 2012
@@ -2004,8 +2004,9 @@ write_revisions(fs_fs_t *fs,
for (i = 0; i < pack->info->nelts; ++i)
{
revision_info_t *info = APR_ARRAY_IDX(pack->info, i,
revision_info_t*);
- svn_stream_printf(stream, itempool, "%" APR_UINT64_T_FMT "\n",
- info->target.offset);
+ SVN_ERR(svn_stream_printf(stream, itempool,
+ "%" APR_UINT64_T_FMT "\n",
+ info->target.offset));
svn_pool_clear(itempool);
}
}
