You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2014/04/22 14:04:02 UTC
svn commit: r1589099 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c
Author: ivan
Date: Tue Apr 22 12:04:02 2014
New Revision: 1589099
URL: http://svn.apache.org/r1589099
Log:
* subversion/libsvn_fs/fs-loader.c
(svn_fs_open2): Use SCRATCH_POOL for open_fs vtable call.
Modified:
subversion/trunk/subversion/libsvn_fs/fs-loader.c
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1589099&r1=1589098&r2=1589099&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Apr 22 12:04:02 2014
@@ -513,7 +513,7 @@ svn_fs_open2(svn_fs_t **fs_p, const char
SVN_ERR(fs_library_vtable(&vtable, path, scratch_pool));
*fs_p = fs_new(fs_config, result_pool);
- SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, result_pool,
+ SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, scratch_pool,
common_pool));
SVN_ERR(vtable->set_svn_fs_open(*fs_p, svn_fs_open));
Re: svn commit: r1589099 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On 22 April 2014 16:15, Bert Huijben <be...@qqmail.nl> wrote:
>
>
>> -----Original Message-----
>> From: ivan@apache.org [mailto:ivan@apache.org]
>> Sent: dinsdag 22 april 2014 14:04
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1589099 - /subversion/trunk/subversion/libsvn_fs/fs-
>> loader.c
>>
>> Author: ivan
>> Date: Tue Apr 22 12:04:02 2014
>> New Revision: 1589099
>>
>> URL: http://svn.apache.org/r1589099
>> Log:
>> * subversion/libsvn_fs/fs-loader.c
>> (svn_fs_open2): Use SCRATCH_POOL for open_fs vtable call.
>>
>> Modified:
>> subversion/trunk/subversion/libsvn_fs/fs-loader.c
>>
>> Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
>> URL:
>> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-
>> loader.c?rev=1589099&r1=1589098&r2=1589099&view=diff
>> ==========================================================
>> ====================
>> --- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
>> +++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Apr 22 12:04:02
>> 2014
>> @@ -513,7 +513,7 @@ svn_fs_open2(svn_fs_t **fs_p, const char
>>
>> SVN_ERR(fs_library_vtable(&vtable, path, scratch_pool));
>> *fs_p = fs_new(fs_config, result_pool);
>> - SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, result_pool,
>> + SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, scratch_pool,
>> common_pool));
>
> This either needs a fix somewhere or a comment describing the nonstandard passing of pool arguments, as usually a scratch_pool lives shorter than a 'common_pool', while the usual argument order is 'result_pool, scratch_pool'.
>
'common_pool' is for shared FS data, not for FS instance itself: FS
object is already allocated and has FS->POOL initialized. POOL
argument in vtable function is scratch_pool and it was before my
change, but was not used before my commit.
--
Ivan Zhakov
RE: svn commit: r1589099 - /subversion/trunk/subversion/libsvn_fs/fs-loader.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: ivan@apache.org [mailto:ivan@apache.org]
> Sent: dinsdag 22 april 2014 14:04
> To: commits@subversion.apache.org
> Subject: svn commit: r1589099 - /subversion/trunk/subversion/libsvn_fs/fs-
> loader.c
>
> Author: ivan
> Date: Tue Apr 22 12:04:02 2014
> New Revision: 1589099
>
> URL: http://svn.apache.org/r1589099
> Log:
> * subversion/libsvn_fs/fs-loader.c
> (svn_fs_open2): Use SCRATCH_POOL for open_fs vtable call.
>
> Modified:
> subversion/trunk/subversion/libsvn_fs/fs-loader.c
>
> Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-
> loader.c?rev=1589099&r1=1589098&r2=1589099&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
> +++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Apr 22 12:04:02
> 2014
> @@ -513,7 +513,7 @@ svn_fs_open2(svn_fs_t **fs_p, const char
>
> SVN_ERR(fs_library_vtable(&vtable, path, scratch_pool));
> *fs_p = fs_new(fs_config, result_pool);
> - SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, result_pool,
> + SVN_ERR(vtable->open_fs(*fs_p, path, common_pool_lock, scratch_pool,
> common_pool));
This either needs a fix somewhere or a comment describing the nonstandard passing of pool arguments, as usually a scratch_pool lives shorter than a 'common_pool', while the usual argument order is 'result_pool, scratch_pool'.
Bert