You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ivan Zhakov <iv...@visualsvn.com> on 2012/11/17 13:33:37 UTC
Re: svn commit: r1410722 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
On Sat, Nov 17, 2012 at 2:51 PM, <st...@apache.org> wrote:
> Author: stefan2
> Date: Sat Nov 17 10:51:41 2012
> New Revision: 1410722
>
> URL: http://svn.apache.org/viewvc?rev=1410722&view=rev
> Log:
> * subversion/libsvn_fs_fs/fs_fs.c
> (read_plain_window,
> get_combined_window): improve commentary; no functional change
>
[...]
> @@ -7126,14 +7130,22 @@ rep_write_cleanup(void *data)
>
Looks like not mentioned functional change.
> /* Truncate and close the protorevfile. */
> err = svn_io_file_trunc(b->file, b->rep_offset, b->pool);
> - err = svn_error_compose_create(err, svn_io_file_close(b->file, b->pool));
> + if (err)
> + {
> + apr_status_t rc = err->apr_err;
> + svn_error_clear(err);
> + return rc;
> + }
> + err = svn_io_file_close(b->file, b->pool);
> + if (err)
> + {
> + apr_status_t rc = err->apr_err;
> + svn_error_clear(err);
> + return rc;
> + }
>
> - /* Remove our lock regardless of any preceeding errors so that the
> - being_written flag is always removed and stays consistent with the
> - file lock which will be removed no matter what since the pool is
> - going away. */
> - err = svn_error_compose_create(err, unlock_proto_rev(b->fs, txn_id,
> - b->lockcookie, b->pool));
> + /* Remove our lock */
> + err = unlock_proto_rev(b->fs, txn_id, b->lockcookie, b->pool);
> if (err)
> {
> apr_status_t rc = err->apr_err;
>
>
--
Ivan Zhakov
Re: svn commit: r1410722 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Posted by Stefan Fuhrmann <st...@wandisco.com>.
On Sat, Nov 17, 2012 at 1:33 PM, Ivan Zhakov <iv...@visualsvn.com> wrote:
> On Sat, Nov 17, 2012 at 2:51 PM, <st...@apache.org> wrote:
> > Author: stefan2
> > Date: Sat Nov 17 10:51:41 2012
> > New Revision: 1410722
> >
> > URL: http://svn.apache.org/viewvc?rev=1410722&view=rev
> > Log:
> > * subversion/libsvn_fs_fs/fs_fs.c
> > (read_plain_window,
> > get_combined_window): improve commentary; no functional change
> >
> [...]
>
> > @@ -7126,14 +7130,22 @@ rep_write_cleanup(void *data)
> >
> Looks like not mentioned functional change.
>
> > /* Truncate and close the protorevfile. */
> > err = svn_io_file_trunc(b->file, b->rep_offset, b->pool);
> > - err = svn_error_compose_create(err, svn_io_file_close(b->file,
> b->pool));
> > + if (err)
> > + {
> > + apr_status_t rc = err->apr_err;
> > + svn_error_clear(err);
> > + return rc;
> > + }
> > + err = svn_io_file_close(b->file, b->pool);
> > + if (err)
> > + {
> > + apr_status_t rc = err->apr_err;
> > + svn_error_clear(err);
> > + return rc;
> > + }
> >
> > - /* Remove our lock regardless of any preceeding errors so that the
> > - being_written flag is always removed and stays consistent with the
> > - file lock which will be removed no matter what since the pool is
> > - going away. */
> > - err = svn_error_compose_create(err, unlock_proto_rev(b->fs, txn_id,
> > - b->lockcookie,
> b->pool));
> > + /* Remove our lock */
> > + err = unlock_proto_rev(b->fs, txn_id, b->lockcookie, b->pool);
> > if (err)
> > {
> > apr_status_t rc = err->apr_err;
> >
>
Oops .. too early in the morning :/
Fixed in r1410728.
Thanks for noticing!
-- Stefan^2.
--
Certified & Supported Apache Subversion Downloads:
*
http://www.wandisco.com/subversion/download
*