You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Joe Orton <jo...@redhat.com> on 2005/06/14 08:43:34 UTC
[PATCH] ra_dav error handling tweaks
A couple of minor tweaks to error handling in ra_dav; this has passed
davautocheck:
* subversion/libsvn_ra_dav/fetch.c (svn_ra_dav__get_locks): Clear
error returned by svn_ra_dav__parsed_request if returning the error
stored in the baton. Return SVN_NO_ERROR for the non-error case
where err is guaranteed to be NULL by the preceding code.
(custom_get_request): Collapse a redundant conditional.
Index: subversion/libsvn_ra_dav/fetch.c
===================================================================
--- subversion/libsvn_ra_dav/fetch.c (revision 15052)
+++ subversion/libsvn_ra_dav/fetch.c (working copy)
@@ -522,10 +522,7 @@
}
#endif /* ! SVN_NEON_0_25_0 */
- if (err)
- return err;
-
- return SVN_NO_ERROR;
+ return err;
}
/* This implements the ne_block_reader() callback interface. */
@@ -1633,7 +1630,12 @@
FALSE,
pool);
if (baton.err)
- return baton.err;
+ {
+ if (err)
+ svn_error_clear(err);
+
+ return baton.err;
+ }
/* Map status 501: Method Not Implemented to our not implemented error.
1.0.x servers and older don't support this report. */
@@ -1651,7 +1653,7 @@
svn_pool_destroy(baton.scratchpool);
*locks = baton.lock_hash;
- return err;
+ return SVN_NO_ERROR;
}
/* ------------------------------------------------------------------------- */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] ra_dav error handling tweaks
Posted by kf...@collab.net.
Joe Orton <jo...@redhat.com> writes:
> > Thanks; committed in r15056.
> >
> > (Any reason you'd rather not commit it yourself? Or if you meant to,
> > we can always change svn:author on r15056, just let me know :-) )
>
> I'm not subscribed to dev@ or anything at the moment, so I'm not really
> "plugged in" and would miss any feedback on changes I committed etc. If
> you're less worried about that than me wasting your time sheparding a
> couple of patches then I can do, of course ;)
No, not a problem at all -- I'm happy to proxy commit for you, and
these reasons make sense. I just wanted to make sure you didn't think
your commit access had expired or something (we don't do that).
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] ra_dav error handling tweaks
Posted by "Peter N. Lundblad" <pe...@famlundblad.se>.
On Wed, 15 Jun 2005, Joe Orton wrote:
> On Tue, Jun 14, 2005 at 12:58:12PM -0500, kfogel@collab.net wrote:
> > Joe Orton <jo...@redhat.com> writes:
> > > A couple of minor tweaks to error handling in ra_dav; this has passed
> > > davautocheck:
> > >
> > > * subversion/libsvn_ra_dav/fetch.c (svn_ra_dav__get_locks): Clear
> > > error returned by svn_ra_dav__parsed_request if returning the error
> > > stored in the baton. Return SVN_NO_ERROR for the non-error case
> > > where err is guaranteed to be NULL by the preceding code.
> > > (custom_get_request): Collapse a redundant conditional.
> >
> > Thanks; committed in r15056.
> >
> > (Any reason you'd rather not commit it yourself? Or if you meant to,
> > we can always change svn:author on r15056, just let me know :-) )
>
> I'm not subscribed to dev@ or anything at the moment, so I'm not really
> "plugged in" and would miss any feedback on changes I committed etc. If
> you're less worried about that than me wasting your time sheparding a
> couple of patches then I can do, of course ;)
>
Just FYI, replies to commit messages normally go to the
committer@tigris.org as well. I think that was added some time ago, since
some partial committers don't read dev@ very often either.
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] ra_dav error handling tweaks
Posted by Joe Orton <jo...@redhat.com>.
On Tue, Jun 14, 2005 at 12:58:12PM -0500, kfogel@collab.net wrote:
> Joe Orton <jo...@redhat.com> writes:
> > A couple of minor tweaks to error handling in ra_dav; this has passed
> > davautocheck:
> >
> > * subversion/libsvn_ra_dav/fetch.c (svn_ra_dav__get_locks): Clear
> > error returned by svn_ra_dav__parsed_request if returning the error
> > stored in the baton. Return SVN_NO_ERROR for the non-error case
> > where err is guaranteed to be NULL by the preceding code.
> > (custom_get_request): Collapse a redundant conditional.
>
> Thanks; committed in r15056.
>
> (Any reason you'd rather not commit it yourself? Or if you meant to,
> we can always change svn:author on r15056, just let me know :-) )
I'm not subscribed to dev@ or anything at the moment, so I'm not really
"plugged in" and would miss any feedback on changes I committed etc. If
you're less worried about that than me wasting your time sheparding a
couple of patches then I can do, of course ;)
joe
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] ra_dav error handling tweaks
Posted by kf...@collab.net.
Joe Orton <jo...@redhat.com> writes:
> A couple of minor tweaks to error handling in ra_dav; this has passed
> davautocheck:
>
> * subversion/libsvn_ra_dav/fetch.c (svn_ra_dav__get_locks): Clear
> error returned by svn_ra_dav__parsed_request if returning the error
> stored in the baton. Return SVN_NO_ERROR for the non-error case
> where err is guaranteed to be NULL by the preceding code.
> (custom_get_request): Collapse a redundant conditional.
Thanks; committed in r15056.
(Any reason you'd rather not commit it yourself? Or if you meant to,
we can always change svn:author on r15056, just let me know :-) )
-Karl
> Index: subversion/libsvn_ra_dav/fetch.c
> ===================================================================
> --- subversion/libsvn_ra_dav/fetch.c (revision 15052)
> +++ subversion/libsvn_ra_dav/fetch.c (working copy)
> @@ -522,10 +522,7 @@
> }
> #endif /* ! SVN_NEON_0_25_0 */
>
> - if (err)
> - return err;
> -
> - return SVN_NO_ERROR;
> + return err;
> }
>
> /* This implements the ne_block_reader() callback interface. */
> @@ -1633,7 +1630,12 @@
> FALSE,
> pool);
> if (baton.err)
> - return baton.err;
> + {
> + if (err)
> + svn_error_clear(err);
> +
> + return baton.err;
> + }
>
> /* Map status 501: Method Not Implemented to our not implemented error.
> 1.0.x servers and older don't support this report. */
> @@ -1651,7 +1653,7 @@
> svn_pool_destroy(baton.scratchpool);
>
> *locks = baton.lock_hash;
> - return err;
> + return SVN_NO_ERROR;
> }
>
> /* ------------------------------------------------------------------------- */
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org