Re: svn commit: r34313 - branches/tc_url_rev/subversion/libsvn_wc

Thanks Julian, I was gonna do this but almost forgot.
~Neels

julianfoad_at_tigris.org wrote:
> Author: julianfoad
> Date: Fri Nov 21 08:56:46 2008
> New Revision: 34313
>
> Log:
> Fix a function return-type mismatch which would have leaked an error.
>
> * subversion/libsvn_wc/tree_conflicts.c
> (write_node_version_info): Change the signature to return (svn_error_t *),
> as it already tries to return an error.
> (svn_wc__write_tree_conflicts): Adjust calls accordingly.
>
> Modified:
> branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
>
> Modified: branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c
> URL: http://svn.collab.net/viewvc/svn/branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c?pathrev=34313&r1=34312&r2=34313
> ==============================================================================
> --- branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c Fri Nov 21 08:52:54 2008 (r34312)
> +++ branches/tc_url_rev/subversion/libsvn_wc/tree_conflicts.c Fri Nov 21 08:56:46 2008 (r34313)
> @@ -377,7 +377,7 @@ write_integer_field(svn_stringbuf_t *buf
> }
>
> /* Append to BUF the several fields that represent VERSION_INFO, */
> -static void
> +static svn_error_t *
> write_node_version_info(svn_stringbuf_t *buf,
> const svn_wc_conflict_version_t *version_info,
> apr_pool_t *pool)
> @@ -395,6 +395,7 @@ write_node_version_info(svn_stringbuf_t
> svn_stringbuf_appendbytes(buf, &field_separator, 1);
>
> SVN_ERR(write_enum_field(buf, node_kind_map, version_info->node_kind));
> + return SVN_NO_ERROR;
> }
>
> /*
> @@ -445,12 +446,12 @@ svn_wc__write_tree_conflicts(char **conf
> svn_stringbuf_appendbytes(buf, &field_separator, 1);
>
> /* older_version */
> - write_node_version_info(buf, &conflict->older_version, pool);
> + SVN_ERR(write_node_version_info(buf, &conflict->older_version, pool));
>
> svn_stringbuf_appendbytes(buf, &field_separator, 1);
>
> /* their_version */
> - write_node_version_info(buf, &conflict->their_version, pool);
> + SVN_ERR(write_node_version_info(buf, &conflict->their_version, pool));
>
> if (i < (conflicts->nelts - 1))
> svn_stringbuf_appendbytes(buf, &desc_separator, 1);
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>