You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2012/10/18 13:45:46 UTC
RE: svn commit: r1399462 - in /subversion/trunk: subversion/libsvn_client/ subversion/libsvn_subr/ subversion/libsvn_wc/ subversion/mod_dav_svn/ subversion/svn/ subversion/svnserve/ subversion/tests/libsvn_subr/ subversion/tests/libsvn_wc/ tools/server-si
> -----Original Message-----
> From: danielsh@apache.org [mailto:danielsh@apache.org]
> Sent: donderdag 18 oktober 2012 00:22
> To: commits@subversion.apache.org
> Subject: svn commit: r1399462 - in /subversion/trunk:
> subversion/libsvn_client/ subversion/libsvn_subr/ subversion/libsvn_wc/
> subversion/mod_dav_svn/ subversion/svn/ subversion/svnserve/
> subversion/tests/libsvn_subr/ subversion/tests/libsvn_wc/ tools/server-
> side/
>
> 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/m
> erge.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/gp
> g_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/na
> med_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/sys
> info.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);
This replaces one error leak by another one.
>
> 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));
And so does this one.
>
> 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));
And this one.
>
> 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));
And this one.
>
> 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));
And this one.
>
> 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));
Same.
>
> return err;
> }
<snip>
Bert
Re: svn commit: r1399462 - in /subversion/trunk:
subversion/libsvn_client/ subversion/libsvn_subr/
subversion/libsvn_wc/ subversion/mod_dav_svn/ subversion/svn/
subversion/svnserve/ subversion/tests/libsvn_subr/
subversion/tests/libsvn_wc/ tools/server-si
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Fixed all in r1399466 and r1399860. Thanks for the review.
Bert Huijben wrote on Thu, Oct 18, 2012 at 13:45:46 +0200:
> > + SVN_ERR(svn_stream_close(lsbinfo));
> > if (err)
> > {
> > svn_error_clear(err);
>
> This replaces one error leak by another one.
>