You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/14 17:57:38 UTC

svn commit: r1146770 - /subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c

Author: danielsh
Date: Thu Jul 14 15:57:37 2011
New Revision: 1146770

URL: http://svn.apache.org/viewvc?rev=1146770&view=rev
Log:
Pool usage fixes.  (How come no one caught that in post-commit review?)

* subversion/libsvn_fs_fs/rep-cache.c
  (svn_fs_fs__walk_rep_reference):
    Destroy the iterpool.  Use the iterpool in more places.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c?rev=1146770&r1=1146769&r2=1146770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c Thu Jul 14 15:57:37 2011
@@ -163,7 +163,7 @@ svn_fs_fs__walk_rep_reference(svn_fs_t *
         SVN_ERR(cancel_func(cancel_baton));
 
       /* Construct a representation_t. */
-      rep = apr_pcalloc(pool, sizeof(*rep));
+      rep = apr_pcalloc(iterpool, sizeof(*rep));
       sha1_digest = svn_sqlite__column_text(stmt, 0, iterpool);
       SVN_ERR(svn_checksum_parse_hex(&rep->sha1_checksum,
                                      svn_checksum_sha1, sha1_digest,
@@ -175,7 +175,7 @@ svn_fs_fs__walk_rep_reference(svn_fs_t *
 
       /* Sanity check. */
       if (rep)
-        SVN_ERR(rep_has_been_born(rep, fs, pool));
+        SVN_ERR(rep_has_been_born(rep, fs, iterpool));
 
       /* Walk. */
       SVN_ERR(walker(rep, walker_baton, fs, iterpool));
@@ -184,6 +184,7 @@ svn_fs_fs__walk_rep_reference(svn_fs_t *
     }
 
   SVN_ERR(svn_sqlite__reset(stmt));
+  svn_pool_destroy(iterpool);
 
   return SVN_NO_ERROR;
 }



Re: svn commit: r1146770 - /subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Greg Stein wrote on Thu, Jul 14, 2011 at 12:19:07 -0400:
> On Thu, Jul 14, 2011 at 11:57,  <da...@apache.org> wrote:
> > Author: danielsh
> > Date: Thu Jul 14 15:57:37 2011
> > New Revision: 1146770
> >
> > URL: http://svn.apache.org/viewvc?rev=1146770&view=rev
> > Log:
> > Pool usage fixes.  (How come no one caught that in post-commit review?)
> 
> Not enough context in the diffs to see there was an iterpool...

r1146226

Re: svn commit: r1146770 - /subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c

Posted by Greg Stein <gs...@gmail.com>.
On Thu, Jul 14, 2011 at 11:57,  <da...@apache.org> wrote:
> Author: danielsh
> Date: Thu Jul 14 15:57:37 2011
> New Revision: 1146770
>
> URL: http://svn.apache.org/viewvc?rev=1146770&view=rev
> Log:
> Pool usage fixes.  (How come no one caught that in post-commit review?)

Not enough context in the diffs to see there was an iterpool...