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 2010/07/16 15:50:38 UTC
RE: svn commit: r964704 -
/subversion/trunk/subversion/libsvn_wc/wc_db.c
Doesn't _update handle this specific reset? If not I think it should.
Bert Huijben (mobile phone)
----- Oorspronkelijk bericht -----
Van: philip@apache.org
Verzonden: vrijdag 16 juli 2010 9:57
Aan: commits@subversion.apache.org
Onderwerp: svn commit: r964704 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: philip
Date: Fri Jul 16 07:57:02 2010
New Revision: 964704
URL: http://svn.apache.org/viewvc?rev=964704&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_base_set_dav_cache): Reset stmt on error, this adds a
missing parameter to svn_error_createf.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=964704&r1=964703&r2=964704&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Jul 16 07:57:02 2010
@@ -2158,6 +2158,7 @@ svn_wc__db_base_set_dav_cache(svn_wc__db
if (affected_rows != 1)
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
+ svn_sqlite__reset(stmt),
_("The node '%s' was not found."),
svn_dirent_local_style(local_abspath,
scratch_pool));
Re: svn commit: r964704 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Posted by Philip Martin <ph...@wandisco.com>.
Greg Stein <gs...@gmail.com> writes:
> Yes, svn_sqlite__update() *does* reset the statement before returning
> (it isn't something where you can iterate over results; it is done; so
> it resets the statement).
>
> Thus, the extra reset should not be there. "Following the pattern"
> isn't right here.
Ah, I didn't understand Bert's point. So we need a NULL.
>
>
> On Fri, Jul 16, 2010 at 13:44, Philip Martin <ph...@wandisco.com> wrote:
>> Bert Huijben <be...@qqmail.nl> writes:
>>
>>> Doesn't _update handle this specific reset? If not I think it should.
>>
>> The compiler was complaing about a missing argument to
>> svn_error_createf. I was just following the pattern used by next
>> function.
>>
>>> if (affected_rows != 1)
>>> return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
>>> + svn_sqlite__reset(stmt),
>>> _("The node '%s' was not found."),
>>> svn_dirent_local_style(local_abspath,
>>> scratch_pool));
>>
>> --
>> Philip
>>
>
--
Philip
Re: svn commit: r964704 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Posted by Greg Stein <gs...@gmail.com>.
Yes, svn_sqlite__update() *does* reset the statement before returning
(it isn't something where you can iterate over results; it is done; so
it resets the statement).
Thus, the extra reset should not be there. "Following the pattern"
isn't right here.
On Fri, Jul 16, 2010 at 13:44, Philip Martin <ph...@wandisco.com> wrote:
> Bert Huijben <be...@qqmail.nl> writes:
>
>> Doesn't _update handle this specific reset? If not I think it should.
>
> The compiler was complaing about a missing argument to
> svn_error_createf. I was just following the pattern used by next
> function.
>
>> if (affected_rows != 1)
>> return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
>> + svn_sqlite__reset(stmt),
>> _("The node '%s' was not found."),
>> svn_dirent_local_style(local_abspath,
>> scratch_pool));
>
> --
> Philip
>
Re: svn commit: r964704 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Posted by Philip Martin <ph...@wandisco.com>.
Bert Huijben <be...@qqmail.nl> writes:
> Doesn't _update handle this specific reset? If not I think it should.
The compiler was complaing about a missing argument to
svn_error_createf. I was just following the pattern used by next
function.
> if (affected_rows != 1)
> return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
> + svn_sqlite__reset(stmt),
> _("The node '%s' was not found."),
> svn_dirent_local_style(local_abspath,
> scratch_pool));
--
Philip
Re: svn commit: r964704 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Posted by Philip Martin <ph...@wandisco.com>.
Bert Huijben <be...@qqmail.nl> writes:
> Doesn't _update handle this specific reset? If not I think it should.
The compiler was complaing about a missing argument to
svn_error_createf. I was just following the pattern used by next
function.
> if (affected_rows != 1)
> return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
> + svn_sqlite__reset(stmt),
> _("The node '%s' was not found."),
> svn_dirent_local_style(local_abspath,
> scratch_pool));
--
Philip